提交 ad27bab4 编写于 作者: K Kohsuke Kawaguchi

[FIXED HUDSON-53 HUDSON-4884] build displayName is now modifiable to arbitrary text.

上级 847aefde
......@@ -45,6 +45,10 @@ Upcoming changes</a>
(<a href="http://issues.hudson-ci.org/browse/HUDSON-5655">issue 5655</a>)
<li class=rfe>
Debian package init script now honors <tt>~/.profile</tt>.
<li class=rfe>
Build names (e.g., "#123") can be now modified by users/plugins to arbitrary text.
(<a href="http://issues.hudson-ci.org/browse/HUDSON-53">issue 53</a>,
<a href="http://issues.hudson-ci.org/browse/HUDSON-4884">issue 4884</a>)
</ul>
</div><!--=TRUNK-END=-->
......
......@@ -393,7 +393,7 @@ public class MailSender {
}
private String getSubject(AbstractBuild<?, ?> build, String caption) {
return caption + ' ' + build.getProject().getFullDisplayName() + " #" + build.getNumber();
return caption + ' ' + build.getFullDisplayName();
}
/**
......
......@@ -26,11 +26,11 @@ THE SOFTWARE.
Displays the console output
-->
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
<l:layout title="${it.project.displayName} #${it.number} ${%Changes}">
<l:layout title="${it.fullDisplayName} ${%Changes}">
<st:include page="sidepanel.jelly" />
<l:main-panel>
<t:buildCaption>${%Changes}</t:buildCaption>
<st:include page="index.jelly" it="${it.changeSet}" />
</l:main-panel>
</l:layout>
</j:jelly>
\ No newline at end of file
</j:jelly>
......@@ -24,7 +24,7 @@ THE SOFTWARE.
-->
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
<l:layout title="${it.project.displayName} #${it.number}">
<l:layout title="${it.fullDisplayName}">
<st:include page="sidepanel.jelly" />
<l:main-panel>
<div style="float:right; background-color:white; z-index: 1; position:relative; margin-left: 1em">
......@@ -47,7 +47,7 @@ THE SOFTWARE.
</div>
<t:buildCaption>
${%Build} #${it.number}
${%Build} ${it.displayName}
(<i:formatDate value="${it.timestamp.time}" type="both" dateStyle="medium" timeStyle="medium"/>)
</t:buildCaption>
......
......@@ -26,7 +26,7 @@ THE SOFTWARE.
Side panel for the build view.
-->
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
<l:header title="${it.parent.name} run #${it.number}" />
<l:header title="${it.fullDisplayName}" />
<l:side-panel>
<l:tasks>
<l:task icon="images/24x24/up.gif" href="${rootURL}/${it.parent.url}" title="${%Back to Job}" />
......@@ -44,4 +44,4 @@ THE SOFTWARE.
</j:if>
</l:tasks>
</l:side-panel>
</j:jelly>
\ No newline at end of file
</j:jelly>
......@@ -34,7 +34,7 @@ THE SOFTWARE.
<j:set var="build" value="${request.findAncestorObject(buildClass)}" />
<st:include page="sidepanel.jelly" it="${build}" />
<l:main-panel>
<h1>${%Build} #${build.number}</h1>
<h1>${%Build} ${build.displayName}</h1>
<l:pane title="${%Parameters}" width="3">
<j:forEach var="parameterValue" items="${it.parameters}">
<st:include it="${parameterValue}"
......
......@@ -31,7 +31,7 @@ THE SOFTWARE.
<j:set var="b" value="${it.resolve(job)}"/>
<j:if test="${b!=null}">
<li>
<a href="${it.id}/">${%format(it.displayName,b.number,b.timestampString)}</a>
<a href="${it.id}/">${%format(it.displayName,b.displayName,b.timestampString)}</a>
</li>
</j:if>
</j:jelly>
\ No newline at end of file
</j:jelly>
......@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
format={0} (#{1}), {2} ago
\ No newline at end of file
format={0} ({1}), {2} ago
......@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
format={0} (#{1}), {2} siden
format={0} ({1}), {2} siden
......@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
format={0} (#{1}), vor {2}
format={0} ({1}), vor {2}
......@@ -20,5 +20,5 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
format="{0} (#{1}), hace {2}"
format="{0} ({1}), hace {2}"
......@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
format={0} (#{1}), {2} sitten
format={0} ({1}), {2} sitten
......@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
format={0} (#{1}), il y a {2}
format={0} ({1}), il y a {2}
......@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
format={0} (#{1}), {2} fa
format={0} ({1}), {2} fa
......@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
format={0} (#{1}), {2}
\ No newline at end of file
format={0} ({1}), {2}
......@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
format={0} (#{1}), {2} siden
format={0} ({1}), {2} siden
......@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
format={0} (#{1}), sinds {2}
format={0} ({1}), sinds {2}
......@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
format={0} (#{1}), {2} atr\u00e1s
format={0} ({1}), {2} atr\u00e1s
......@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
format={0} (#{1}), {2} \u043d\u0430\u0437\u0430\u0434
format={0} ({1}), {2} \u043d\u0430\u0437\u0430\u0434
......@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
format="{0} (#{1}), prej {2}"
format="{0} ({1}), prej {2}"
......@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
format={0} (#{1}), {2} sedan
format={0} ({1}), {2} sedan
......@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
format={0} (#{1}), {2} \u00f6nce
format={0} ({1}), {2} \u00f6nce
......@@ -20,4 +20,4 @@
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
# THE SOFTWARE.
format={0}(#{1}),{2}\u524D
format={0}({1}),{2}\u524D
......@@ -24,7 +24,7 @@ THE SOFTWARE.
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
<j:if test="${!h.isArtifactsPermissionEnabled() or h.isArtifactsPermissionEnabled() and h.hasPermission(it.ARTIFACTS)}">
<l:layout title="${it.parent.displayName} #${it.number} Artifacts">
<l:layout title="${it.fullDisplayName} Artifacts">
<st:include page="sidepanel.jelly" />
<l:main-panel>
<t:buildCaption>
......
......@@ -24,7 +24,7 @@ THE SOFTWARE.
<!-- Confirm deletion of the build/run -->
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
<l:layout title="${it.parent.displayName} #${it.number}" norefresh="true">
<l:layout title="${it.fullDisplayName}" norefresh="true">
<st:include page="sidepanel.jelly" />
<l:main-panel>
<j:set var="msg" value="${it.whyKeepLog}"/>
......@@ -39,4 +39,4 @@ THE SOFTWARE.
</j:if>
</l:main-panel>
</l:layout>
</j:jelly>
\ No newline at end of file
</j:jelly>
......@@ -26,7 +26,7 @@ THE SOFTWARE.
Displays the console output
-->
<st:compress xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
<l:layout title="${it.parent.displayName} #${it.number} Console" norefresh="true">
<l:layout title="${it.fullDisplayName} Console" norefresh="true">
<st:include page="sidepanel.jelly" />
<l:main-panel>
<t:buildCaption>
......
......@@ -26,7 +26,7 @@ THE SOFTWARE.
<l:layout norefresh="true">
<st:include it="${it.build}" page="sidepanel.jelly" />
<l:main-panel>
<h1>Build #${it.build.number}</h1>
<h1>Build ${it.build.displayName}</h1>
<p>
${%Tagging is in progress:}
</p>
......@@ -34,4 +34,4 @@ THE SOFTWARE.
<st:include page="log.jelly" />
</l:main-panel>
</l:layout>
</j:jelly>
\ No newline at end of file
</j:jelly>
......@@ -27,11 +27,11 @@ THE SOFTWARE.
<j:choose>
<j:when test="${lfBuild!=null}">
${lfBuild.timestampString}
(<a href="${jobBaseUrl}${job.shortUrl}lastFailedBuild/">#${lfBuild.number}</a>)
(<a href="${jobBaseUrl}${job.shortUrl}lastFailedBuild/">${lfBuild.displayName}</a>)
</j:when>
<j:otherwise>
${%N/A}
</j:otherwise>
</j:choose>
</td>
</j:jelly>
\ No newline at end of file
</j:jelly>
......@@ -28,7 +28,7 @@ THE SOFTWARE.
<j:choose>
<j:when test="${lstBuild!=null}">
${lstBuild.timestampString}
(<a href="${jobBaseUrl}${job.shortUrl}lastStableBuild/">#${lstBuild.number}</a>)
(<a href="${jobBaseUrl}${job.shortUrl}lastStableBuild/">${lstBuild.displayName}</a>)
</j:when>
<j:otherwise>
${%N/A}
......
......@@ -27,11 +27,11 @@ THE SOFTWARE.
<j:choose>
<j:when test="${lsBuild!=null}">
${lsBuild.timestampString}
(<a href="${jobBaseUrl}${job.shortUrl}lastSuccessfulBuild/">#${lsBuild.number}</a>)
(<a href="${jobBaseUrl}${job.shortUrl}lastSuccessfulBuild/">${lsBuild.displayName}</a>)
</j:when>
<j:otherwise>
${%N/A}
</j:otherwise>
</j:choose>
</td>
</j:jelly>
\ No newline at end of file
</j:jelly>
......@@ -31,7 +31,7 @@ THE SOFTWARE.
<tr class="build-row no-wrap ${transitive}">
<td>
<img width="16" height="16" src="${imagesURL}/16x16/${build.buildStatusUrl}" alt="${build.iconColor.description}" tooltip="${build.iconColor.description}" /><st:nbsp/>
#${build.number}
${build.displayName}
</td>
<td style="padding-right:0">
<a class="tip" href="${link}">
......
......@@ -54,7 +54,7 @@ THE SOFTWARE.
<td>
<a href="${jobBaseUrl}${b.parent.url}">${b.parent.fullDisplayName}</a>
<st:nbsp/>
<a href="${jobBaseUrl}${b.url}">#${b.number}</a>
<a href="${jobBaseUrl}${b.url}">${b.displayName}</a>
</td>
<td data="${b.timestampString2}">
${b.timestampString}
......
......@@ -23,7 +23,7 @@ THE SOFTWARE.
-->
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:i="jelly:fmt">
<l:layout title="${it.project.displayName} #${it.number} Execution Record">
<l:layout title="${it.fullDisplayName} Execution Record">
<st:include page="sidepanel.jelly" />
<l:main-panel>
<h1>${%Executed Mojos}</h1>
......@@ -78,4 +78,4 @@ THE SOFTWARE.
</j:choose>
</l:main-panel>
</l:layout>
</j:jelly>
\ No newline at end of file
</j:jelly>
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册