[JENKINS-22295] Added fake URL so that graph detail view uses selecte…

…d graph type.
jenkinsci · May 9, 2016 · ea79d2b · ea79d2b
1 parent ed66289
commit ea79d2b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/src/main/java/hudson/plugins/analysis/core/AbstractProjectAction.java b/src/main/java/hudson/plugins/analysis/core/AbstractProjectAction.java
@@ -181,7 +181,7 @@ public Object getTrendDetails() {
      * @return the details
      */
     public Object getTrendDetails(final StaplerRequest request, final StaplerResponse response) {
-        return new TrendDetails(getProject(), getTrendGraph(request, response, "../../"));
+        return new TrendDetails(getProject(), getTrendGraph(request, response, "../../"), getTrendGraphId());
     }
 
     /**

diff --git a/src/main/java/hudson/plugins/analysis/graph/TrendDetails.java b/src/main/java/hudson/plugins/analysis/graph/TrendDetails.java
@@ -3,7 +3,6 @@
 import org.kohsuke.stapler.StaplerRequest;
 
 import hudson.model.AbstractProject;
-
 import hudson.util.Graph;
 
 /**
@@ -14,6 +13,7 @@
 public class TrendDetails {
     /** The graph to display. */
     private final Graph trendGraph;
+    private final String id;
     /** The project of the graph. */
     private final AbstractProject<?, ?> project;
 
@@ -24,10 +24,14 @@ public class TrendDetails {
      *            the project of the graph
      * @param trendGraph
      *            the graph
+     * @param id
+     *            the ID of the trend graph
      */
-    public TrendDetails(final AbstractProject<?, ?> project, final Graph trendGraph) {
+    public TrendDetails(final AbstractProject<?, ?> project, final Graph trendGraph,
+            final String id) {
         this.project = project;
         this.trendGraph = trendGraph;
+        this.id = id;
     }
 
     /**
@@ -41,6 +45,15 @@ public Graph getTrendGraph(final StaplerRequest request) {
         return trendGraph;
     }
 
+    /**
+     * Returns the ID of the selected trend graph.
+     *
+     * @return ID of the selected trend graph
+     */
+    public String getTrendGraphId() {
+        return id;
+    }
+
     /**
      * Returns the abstractProject.
      *

diff --git a/src/main/resources/hudson/plugins/analysis/graph/TrendDetails/index.jelly b/src/main/resources/hudson/plugins/analysis/graph/TrendDetails/index.jelly
@@ -5,7 +5,9 @@
   <l:layout norefresh="true">
     <st:include it="${it.project}" page="sidepanel.jelly" />
     <l:main-panel>
-      <img src="trendGraph/png?width=800&amp;height=600" lazymap="trendGraph/map?width=800&amp;height=600"/>
+      <!-- Note that the parameter url=${trendGraphId} is not used by the graph: it
+           has been added to provide different URLs so that the images are not cached by the browser. -->
+      <img src="trendGraph/png?width=800&amp;height=600&amp;url=${it.trendGraphId}" lazymap="trendGraph/map?width=800&amp;height=600&amp;url=${it.trendGraphId}"/>
     </l:main-panel>
   </l:layout>
 </j:jelly>