Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[FIXED JENKINS-23636] Indicate node the job workspace is on
  • Loading branch information
daniel-beck committed Jun 30, 2014
1 parent 264bd1a commit e01967e
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 2 deletions.
9 changes: 8 additions & 1 deletion core/src/main/java/hudson/model/AbstractProject.java
Expand Up @@ -1886,7 +1886,14 @@ public DirectoryBrowserSupport doWs( StaplerRequest req, StaplerResponse rsp ) t
req.getView(this,"noWorkspace.jelly").forward(req,rsp);
return null;
} else {
return new DirectoryBrowserSupport(this, ws, getDisplayName()+" workspace", "folder.png", true);
Computer c = ws.toComputer();
String title;
if (c == null) {
title = Messages.AbstractProject_WorkspaceTitle(getDisplayName());
} else {
title = Messages.AbstractProject_WorkspaceTitleOnComputer(getDisplayName(), c.getDisplayName());
}
return new DirectoryBrowserSupport(this, ws, title, "folder.png", true);
}
}

Expand Down
2 changes: 1 addition & 1 deletion core/src/main/java/hudson/model/Run.java
Expand Up @@ -2063,7 +2063,7 @@ public Summary(boolean worse, String message) {
if(Functions.isArtifactsPermissionEnabled()) {
checkPermission(ARTIFACTS);
}
return new DirectoryBrowserSupport(this, getArtifactManager().root(), project.getDisplayName() + ' ' + getDisplayName(), "package.png", true);
return new DirectoryBrowserSupport(this, getArtifactManager().root(), Messages.Run_ArtifactsBrowserTitle(project.getDisplayName(), getDisplayName()), "package.png", true);
}

/**
Expand Down
Expand Up @@ -28,6 +28,7 @@ THE SOFTWARE.
<l:layout title="${it.title} : ${path}">
<st:include page="sidepanel.jelly" it="${it.owner}"/>
<l:main-panel>
<h1><l:breakable value="${it.title}"/></h1>
<div class="dirTree">
<!-- parent path -->
<div class="parentPath">
Expand Down
3 changes: 3 additions & 0 deletions core/src/main/resources/hudson/model/Messages.properties
Expand Up @@ -46,6 +46,8 @@ AbstractProject.ETA=\ (ETA:{0})
AbstractProject.NoBuilds=No existing build. Scheduling a new one.
AbstractProject.NoSCM=No SCM
AbstractProject.NoWorkspace=No workspace is available, so can\u2019t check for updates.
AbstractProject.WorkspaceTitle=Workspace of {0}
AbstractProject.WorkspaceTitleOnComputer=Workspace of {0} on {1}
AbstractProject.PollingABorted=SCM polling aborted
AbstractProject.ScmAborted=SCM check out aborted
AbstractProject.WorkspaceOffline=Workspace is offline.
Expand Down Expand Up @@ -225,6 +227,7 @@ Run.ArtifactsPermission.Description=\
builds. If you don\u2019t want an user to access the artifacts, you can do so by \
revoking this permission.
Run.InProgressDuration={0} and counting
Run.ArtifactsBrowserTitle=Artifacts of {0} {1}

Run.Summary.Stable=stable
Run.Summary.Unstable=unstable
Expand Down

0 comments on commit e01967e

Please sign in to comment.