Skip to content
Permalink
Browse files

[FIXED JENKINS-14264] For logs >200Kb, just show two <t:task>s withou…

…t nesting, for proper interoperability with the context menu.
  • Loading branch information
jglick committed Jun 17, 2014
1 parent c3a2dae commit 87e2d32faa4f4de9793c7cfcdc365baceedb0411
Showing with 6 additions and 10 deletions.
  1. +3 −0 changelog.html
  2. +3 −10 core/src/main/resources/hudson/model/AbstractBuild/tasks.jelly
@@ -61,6 +61,9 @@
<li class=bug>
Failed to correctly resave a project configuration containing both a forward and a reverse build trigger.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-23191">issue 23191</a>)
<li class=bug>
Long log output resulted in missing Console link in popup.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-14264">issue 14264</a>)
<li class="major bug">
HTTP error 405 when trying to restart ssh host.
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-23094">issue 23094</a>)
@@ -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>

This comment has been minimized.

Copy link
@oleg-nenashev

oleg-nenashev Jun 17, 2014

Member

Seems that existing translations will be ignored in the new version

This comment has been minimized.

Copy link
@jglick

jglick Jun 17, 2014

Author Member

Yes. I thought about moving the existing translations, but we have no project standard for how Unicode should be represented in *.properties (i.e., uppercase or lowercase escapes; whether U+0080–U+00FF should escaped or raw), and in the past people have complained about localization refactorings from me that changed those syntactic details. So I left it alone for now.

IMHO it would be better for there to be a single translation for the whole project, regardless of source file path.

</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}"/>

This comment has been minimized.

Copy link
@daniel-beck

daniel-beck Jun 17, 2014

Member

View what as plain text?

This comment has been minimized.

Copy link
@jglick

jglick Jun 17, 2014

Author Member

Well if it is not obvious we can change the message. Seemed good enough for now.

This comment has been minimized.

Copy link
@oleg-nenashev

oleg-nenashev Jun 17, 2014

Member

"Console Output (Raw)"?
BTW, nested tasks would be useful

This comment has been minimized.

Copy link
@jglick

jglick Jun 17, 2014

Author Member

You cannot have nested tasks in this branch—that is the whole point of the >200Kb test.

</j:when>
<j:otherwise>
<l:task icon="images/24x24/terminal.png" href="${buildUrl.baseUrl}/console" title="${%Console Output}" >

0 comments on commit 87e2d32

Please sign in to comment.
You can’t perform that action at this time.