[JENKINS-60138] Fixed job links for jobs in folders (#62)

Use getUrl() instead of reinventing its logic in jelly
jenkinsci · Feb 19, 2024 · d7bd6e3 · d7bd6e3
1 parent ccf008e
commit d7bd6e3
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/main/java/hudson/plugins/global_build_stats/JobBuildResultFactory.java b/src/main/java/hudson/plugins/global_build_stats/JobBuildResultFactory.java
@@ -36,19 +36,21 @@ public JobBuildSearchResult createJobBuildSearchResult(Run<?, ?> build){
     public JobBuildSearchResult createJobBuildSearchResult(JobBuildResult r){
         boolean isJobAccessible = false;
         boolean isBuildAccessible = false;
+        String jobUrl = "";
 
         Job targetJob = ((Job) Jenkins.getInstance().getItemByFullName(r.getJobName()));
         // Link to job will be provided only if job has not been deleted/renamed
         if(targetJob != null){
             isJobAccessible = true;
+            jobUrl = targetJob.getUrl();
             if(targetJob.getBuildByNumber(r.getBuildNumber()) != null){
                 // Link to build infos will be provided only if build result has not been purged
                 // @see issue #7240
                 isBuildAccessible = true;
             }
         }
 
-        return new JobBuildSearchResult(r, isJobAccessible, isBuildAccessible);
+        return new JobBuildSearchResult(r, isJobAccessible, isBuildAccessible, jobUrl);
     }
 
 	public static String extractUserNameIn(Run<?, ?> build){

diff --git a/src/main/java/hudson/plugins/global_build_stats/model/JobBuildSearchResult.java b/src/main/java/hudson/plugins/global_build_stats/model/JobBuildSearchResult.java
@@ -14,12 +14,14 @@ public class JobBuildSearchResult extends JobBuildResult {
 	private boolean jobAccessible;
 	// Will be true if isJobAccessible is true AND build result has not been deleted
 	private boolean buildAccessible;
+	private String jobUrl;
 
-	public JobBuildSearchResult(JobBuildResult decoree, boolean isJobAccessible, boolean isBuildAccessible){
+	public JobBuildSearchResult(JobBuildResult decoree, boolean isJobAccessible, boolean isBuildAccessible, String jobUrl) {
 		super(decoree.getResult(), decoree.getJobName(), decoree.getBuildNumber(), decoree.getBuildDate(), 
 			  decoree.getDuration(), decoree.getNodeName(), decoree.getUserName());
 		this.jobAccessible = isJobAccessible;
 		this.buildAccessible = isBuildAccessible;
+		this.jobUrl = jobUrl;
 	}
 
 	public boolean isJobAccessible() {
@@ -33,4 +35,8 @@ public boolean isBuildAccessible() {
 	public String getDurationString(){
 		return Util.getTimeSpanString(getDuration());
 	}
+
+	public String getJobUrl() {
+		return jobUrl;
+	}
 }
diff --git a/...ain/resources/hudson/plugins/global_build_stats/GlobalBuildStatsPlugin/buildHistory.jelly b/...ain/resources/hudson/plugins/global_build_stats/GlobalBuildStatsPlugin/buildHistory.jelly
@@ -216,7 +216,7 @@
 				    		<td class="pane">
 				    			<j:choose>
 				    				<j:when test="${jobResult.jobAccessible}">
-				    					<a href="${rootURL}/job/${jobResult.jobName}/">${jobResult.jobName}</a>
+				    					<a href="${rootURL}/${jobResult.jobUrl}">${jobResult.jobName}</a>
 				    				</j:when>
 				    				<j:otherwise>
 				    					${jobResult.jobName}
@@ -226,8 +226,8 @@
 				    		<td class="pane">
 				    			<j:choose>
 				    				<j:when test="${jobResult.buildAccessible}">
-						    			<a href="${rootURL}/job/${jobResult.jobName}/${jobResult.buildNumber}/console"><l:icon class="icon-terminal icon-lg"/><br/></a>
-						    			<a href="${rootURL}/job/${jobResult.jobName}/${jobResult.buildNumber}/">#${jobResult.buildNumber}</a>
+						    			<a href="${rootURL}/${jobResult.jobUrl}${jobResult.buildNumber}/console"><l:icon class="icon-terminal icon-lg"/><br/></a>
+						    			<a href="${rootURL}/${jobResult.jobUrl}${jobResult.buildNumber}/">#${jobResult.buildNumber}</a>
 				    				</j:when>
 				    				<j:otherwise>
 				    					#${jobResult.buildNumber}
@@ -237,7 +237,7 @@
 				    		<td class="pane">
 				    			<j:choose>
 				    				<j:when test="${jobResult.buildAccessible}">
-						    			<a href="${rootURL}/job/${jobResult.jobName}/${jobResult.buildNumber}/"><i:formatDate value="${jobResult.buildDate.time}" type="both" dateStyle="medium" timeStyle="medium"/></a>
+						    			<a href="${rootURL}/${jobResult.jobUrl}${jobResult.buildNumber}/"><i:formatDate value="${jobResult.buildDate.time}" type="both" dateStyle="medium" timeStyle="medium"/></a>
 				    				</j:when>
 				    				<j:otherwise>
 				    					<i:formatDate value="${jobResult.buildDate.time}" type="both" dateStyle="medium" timeStyle="medium"/>