[FIXED JENKINS-41669] Buildgraph view does not show for som json resp…

…onses.
jenkinsci · Feb 2, 2017 · c4ad929 · c4ad929
1 parent 3c72beb
commit c4ad929
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/main/webapp/scripts/buildgraph-appctrl.js b/src/main/webapp/scripts/buildgraph-appctrl.js
@@ -8,7 +8,12 @@ angular.module('buildgraphapp', [])
     $scope.callAtTimeout = function() {
         $http.get(ajaxPath)
             .then(function(response) {
-                var data = JSON.parse(response.data);
+                var data = response.data;
+                /* response.data can either be parsed JSON (object) or unparsed String() object
+                 * (or plain type string if angular implementation changes). */
+                if (typeof data === 'string' || data instanceof String) {
+                    data = JSON.parse(response.data);
+                }
                 var buildGraph = JSON.parse(data.buildGraph);
                 if(buildGraph.isBuilding || nodesSize != buildGraph.nodesSize || isBuilding != buildGraph.isBuilding) {
                     nodesSize = buildGraph.nodesSize;