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

allow the build display name to be set by the user.

上级 e878b35b
......@@ -40,6 +40,7 @@ import hudson.console.AnnotatedLargeText;
import hudson.console.ConsoleNote;
import hudson.matrix.MatrixBuild;
import hudson.matrix.MatrixRun;
import hudson.model.Descriptor.FormException;
import hudson.model.listeners.RunListener;
import hudson.model.listeners.SaveableListener;
import hudson.search.SearchIndexBuilder;
......@@ -47,11 +48,14 @@ import hudson.security.ACL;
import hudson.security.AccessControlled;
import hudson.security.Permission;
import hudson.security.PermissionGroup;
import hudson.tasks.BuildTrigger;
import hudson.tasks.LogRotator;
import hudson.tasks.Mailer;
import hudson.tasks.BuildWrapper;
import hudson.tasks.BuildStep;
import hudson.tasks.Publisher;
import hudson.tasks.test.AbstractTestResultAction;
import hudson.util.DescribableList;
import hudson.util.FlushProofOutputStream;
import hudson.util.IOException2;
import hudson.util.LogTaskListener;
......@@ -93,9 +97,12 @@ import java.util.zip.GZIPInputStream;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletResponse;
import net.sf.json.JSONObject;
import org.apache.commons.io.input.NullInputStream;
import org.apache.commons.io.IOUtils;
import org.apache.commons.jelly.XMLOutput;
import org.kohsuke.stapler.HttpResponse;
import org.kohsuke.stapler.HttpResponses;
import org.kohsuke.stapler.QueryParameter;
import org.kohsuke.stapler.StaplerRequest;
import org.kohsuke.stapler.StaplerResponse;
......@@ -168,6 +175,13 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
*/
protected volatile String description;
/**
* Human-readable name of this build. Can be null.
* If non-null, this text is displayed instead of "#NNN", which is the default.
* @since 1.390
*/
private volatile String displayName;
/**
* The current build state.
*/
......@@ -594,11 +608,21 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
@Exported
public String getFullDisplayName() {
return project.getFullDisplayName()+" #"+number;
return project.getFullDisplayName()+' '+getDisplayName();
}
public String getDisplayName() {
return "#"+number;
return displayName!=null ? displayName : "#"+number;
}
public boolean hasCustomDisplayName() {
return displayName!=null;
}
public void setDisplayName(String value) throws IOException {
checkPermission(UPDATE);
this.displayName = value;
save();
}
@Exported(visibility=2)
......@@ -1805,6 +1829,24 @@ public abstract class Run <JobT extends Job<JobT,RunT>,RunT extends Run<JobT,Run
return project.getEstimatedDuration();
}
public HttpResponse doConfigSubmit( StaplerRequest req ) throws IOException, ServletException, FormException {
checkPermission(UPDATE);
BulkChange bc = new BulkChange(this);
try {
JSONObject json = req.getSubmittedForm();
submit(json);
bc.commit();
} finally {
bc.abort();
}
return HttpResponses.redirectToDot();
}
protected void submit(JSONObject json) throws IOException {
setDisplayName(json.getString("displayName"));
setDescription(json.getString("description"));
}
public static final XStream XSTREAM = new XStream2();
static {
XSTREAM.alias("build",FreeStyleBuild.class);
......
......@@ -46,4 +46,5 @@ THE SOFTWARE.
<l:task icon="images/24x24/terminal.gif" href="${buildUrl.baseUrl}/console" title="${%Console Output}" />
</j:otherwise>
</j:choose>
<l:task icon="images/24x24/setting.gif" href="${buildUrl.baseUrl}/configure" title="${h.hasPermission(it,it.UPDATE)?'%Configure':'%View Configuration'}"/>
</j:jelly>
\ No newline at end of file
......@@ -35,6 +35,7 @@ THE SOFTWARE.
<l:task icon="images/24x24/package.gif" href="artifacts-index" title="${%Artifacts}" />
</j:if>
<st:include page="actions.jelly"/>
<l:task icon="images/24x24/setting.gif" href="configure" title="${h.hasPermission(it,it.UPDATE)?'%Configure':'%View Configuration'}"/>
<j:if test="${it.previousBuild!=null}">
<l:task icon="images/24x24/previous.gif" href="${rootURL}/${it.previousBuild.url}" title="${%Previous Run}" />
</j:if>
......
<!--
The MIT License
Copyright (c) 2010, CloudBees, Inc.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
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.displayName} Config" norefresh="true">
<st:include page="sidepanel.jelly" />
<l:main-panel>
<div class="behavior-loading">${%LOADING}</div>
<f:form method="post" action="configSubmit" name="config">
<f:entry title="${%DisplayName}" help="/help/project-config/displayName.html">
<f:textbox name="displayName" value="${it.hasCustomDisplayName()?it.displayName:''}"/>
</f:entry>
<f:entry title="${%Description}" help="/help/project-config/description.html">
<f:textarea name="description" value="${it.description}"/>
</f:entry>
<j:if test="${h.hasPermission(it,it.UPDATE)}">
<f:block>
<f:submit value="${%Save}" />
</f:block>
</j:if>
</f:form>
</l:main-panel>
</l:layout>
</j:jelly>
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册