[FIXED JENKINS-22295] Added fake URL so that graph is updated immedia…

…tly after configuration change.
jenkinsci · May 9, 2016 · ed66289 · ed66289
1 parent 1ce9dcd
commit ed66289
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/src/main/java/hudson/plugins/analysis/core/AbstractProjectAction.java b/src/main/java/hudson/plugins/analysis/core/AbstractProjectAction.java
@@ -238,6 +238,17 @@ public boolean isTrendVisible(final StaplerRequest request) {
         return configuration.isVisible() && configuration.hasMeaningfulGraph();
     }
 
+    /**
+     * Returns the ID of the selected trend graph.
+     *
+     * @return ID of the selected trend graph
+     */
+    public String getTrendGraphId() {
+        GraphConfigurationView configuration = createUserConfiguration(Stapler.getCurrentRequest());
+
+        return configuration.getGraphType().getId();
+    }
+
     /**
      * Returns whether the trend graph is deactivated.
      *

diff --git a/src/main/resources/hudson/plugins/analysis/Messages_de.properties b/src/main/resources/hudson/plugins/analysis/Messages_de.properties
@@ -65,6 +65,7 @@ Trend.type.priority=Gesamtanzahl an Warnungen verteilt nach Priorit
 Trend.type.fixed=Verhältnis von behobenen zu neuen Warnungen
 Trend.type.difference=Differenz zwischen behobenen und neuen Warnungen (aufsummierte Werte)
 Trend.type.health=Anzeige der Gesamtanzahl an Warnungen mit Einfärbung anhand der erreichten Grenzwerte des Gesundheitszustandes
+Trend.type.totals=Gesamtanzahl an Warnungen
 
 ResultAction.Status=Plug-in Resultat:
 ResultAction.NoWarningsSince=Keine Warnungen seit Build {0}

diff --git a/src/main/resources/hudson/plugins/analysis/core/AbstractProjectAction/floatingBox.jelly b/src/main/resources/hudson/plugins/analysis/core/AbstractProjectAction/floatingBox.jelly
@@ -7,7 +7,9 @@
         ${from.trendName}
       </div>
       <div>
-        <img src="${from.urlName}/trendGraph/png" lazymap="${from.urlName}/trendGraph/map" />
+        <!-- Note that the parameter ?url=${from.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="${from.urlName}/trendGraph/png?url=${from.trendGraphId}" lazymap="${from.urlName}/trendGraph/map?url=${from.trendGraphId}" />
       </div>
       <div>
         <a href="${from.urlName}/trendDetails">${%Enlarge}</a>