Merge pull request #33 from menonvarun/bug_fixes

Multiple bug fixes JENKINS-33515, JENKINS-33027, JENKINS-33576
jenkinsci · Mar 16, 2016 · 84924c6 · 84924c6
2 parents 40c6fe3 + 7e1f0fa
commit 84924c6
Show file tree

Hide file tree

Showing 6 changed files with 380 additions and 305 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/testresultsanalyzer/TestResultsAnalyzerAction.java b/src/main/java/org/jenkinsci/plugins/testresultsanalyzer/TestResultsAnalyzerAction.java
@@ -146,6 +146,9 @@ public void getJsonLoadData() {
 			Iterator<Run> runIterator = runs.iterator();
 			while (runIterator.hasNext()) {
 				Run run = runIterator.next();
+				if(run.isBuilding()) {
+					continue;
+				}
 				int buildNumber = run.getNumber();
 				String buildUrl = project.getBuildByNumber(buildNumber).getUrl();
 				builds.add(run.getNumber());

diff --git a/src/main/java/org/jenkinsci/plugins/testresultsanalyzer/TestResultsAnalyzerExtension.java b/src/main/java/org/jenkinsci/plugins/testresultsanalyzer/TestResultsAnalyzerExtension.java
@@ -128,7 +128,7 @@ public boolean configure(StaplerRequest req, JSONObject formData) {
                 e.printStackTrace();
             }
             save();
-            return false;
+            return true;
         }
 
         public String getNoOfBuilds() { return noOfBuilds; }

diff --git a/...resources/org/jenkinsci/plugins/testresultsanalyzer/TestResultsAnalyzerAction/index.jelly b/...resources/org/jenkinsci/plugins/testresultsanalyzer/TestResultsAnalyzerAction/index.jelly
@@ -9,8 +9,9 @@
 <script type="text/javascript" src="${resURL}/plugin/test-results-analyzer/js/handlebars-v2.0.0.js"></script>
 <script type="text/javascript" src="${resURL}/plugin/test-results-analyzer/js/highcharts.js"></script>
 <script type="text/javascript" src="${resURL}/plugin/test-results-analyzer/js/json3-min.js"></script>
+<script type="text/javascript" src="${resURL}/plugin/test-results-analyzer/js/highchart-exporting.js"></script>
+<script type="text/javascript" src="${resURL}/plugin/test-results-analyzer/js/highchart-offline-exporting.js"></script>
 
-<script src="//code.highcharts.com/modules/exporting.js"></script>
 <script type="text/javascript" src="${resURL}/plugin/test-results-analyzer/js/testresult.js"></script>
 <script type="text/javascript" src="${resURL}/plugin/test-results-analyzer/js/chart-generator.js"></script>
 <script type="text/javascript" src="${resURL}/plugin/test-results-analyzer/js/test-result-analyzer-template.js"></script>

diff --git a/src/main/webapp/js/highchart-exporting.js b/src/main/webapp/js/highchart-exporting.js
diff --git a/src/main/webapp/js/highchart-offline-exporting.js b/src/main/webapp/js/highchart-offline-exporting.js