Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[FIXED JENKINS-14264] For logs >200Kb, just show two <t:task>s withou…
…t nesting, for proper interoperability with the context menu.

(cherry picked from commit 87e2d32)

Conflicts:
	changelog.html
  • Loading branch information
jglick authored and olivergondza committed Jul 3, 2014
1 parent bd378a1 commit 001e51e
Showing 1 changed file with 3 additions and 10 deletions.
13 changes: 3 additions & 10 deletions core/src/main/resources/hudson/model/AbstractBuild/tasks.jelly
Expand Up @@ -32,16 +32,9 @@ THE SOFTWARE.
<l:task icon="images/24x24/notepad.png" href="${buildUrl.baseUrl}/changes" title="${%Changes}" />
<j:choose>
<j:when test="${it.logFile.length() > 200000}">
<!-- Show raw link directly so user need not click through live console page. -->
<div class="task">
<a href="${buildUrl.baseUrl}/console">
<img width="24" height="24" style="margin: 2px;" src="${imagesURL}/24x24/terminal.png" alt=""/>
</a>
<st:nbsp />
<a href="${buildUrl.baseUrl}/console">${%Console Output}</a>
<st:nbsp />
<a href="${buildUrl.baseUrl}/consoleText">[${%raw}]</a>
</div>
<!-- Show raw link directly so user need not click through live console page, though this is not so bad now as they would just see: Skipping nnn KB.. Full Log. -->
<l:task icon="images/24x24/terminal.png" href="${buildUrl.baseUrl}/console" title="${%Console Output}"/>
<l:task icon="images/24x24/document.png" href="${buildUrl.baseUrl}/consoleText" title="${%View as plain text}"/>
</j:when>
<j:otherwise>
<l:task icon="images/24x24/terminal.png" href="${buildUrl.baseUrl}/console" title="${%Console Output}" >
Expand Down

0 comments on commit 001e51e

Please sign in to comment.