summaryrefslogtreecommitdiffstats
path: root/app/redfish/controllers
diff options
context:
space:
mode:
authorJames Feist <james.feist@linux.intel.com>2018-11-13 13:30:02 -0800
committerGunnar Mills <gmills@us.ibm.com>2018-11-14 22:27:52 +0000
commitbc5cc7f75c4cb0c81200a2fcb2e68815b2b8c1b9 (patch)
tree24eaf43f2bec559e0a7082292ac97c125808ee2d /app/redfish/controllers
parent5760e53165054efe1e19daa24f500994825ca760 (diff)
downloadphosphor-webui-bc5cc7f75c4cb0c81200a2fcb2e68815b2b8c1b9.tar.gz
phosphor-webui-bc5cc7f75c4cb0c81200a2fcb2e68815b2b8c1b9.zip
redfish: fix json format
Quotes were missing on Arrays, and some commas were in the wrong spot. Tested-by: Copied the output of the managers schema and ran it through python json formatter and it started to pass. Change-Id: Ica6b35b0076654fae6204a99380c05dec1ac401b Signed-off-by: James Feist <james.feist@linux.intel.com>
Diffstat (limited to 'app/redfish/controllers')
-rw-r--r--app/redfish/controllers/redfish-controller.html13
1 files changed, 9 insertions, 4 deletions
diff --git a/app/redfish/controllers/redfish-controller.html b/app/redfish/controllers/redfish-controller.html
index 9446c92..ca7cb75 100644
--- a/app/redfish/controllers/redfish-controller.html
+++ b/app/redfish/controllers/redfish-controller.html
@@ -20,7 +20,7 @@
<ul style="list-style: none;">
<li ng-repeat="(key, value) in value" ng-include="'recurse'"> </li>
</ul>
-},</br>
+}
</span>
<span ng-if="isArray(value)">
@@ -31,10 +31,13 @@
<ul style="list-style: none;">
<li ng-repeat="(key, value) in val" ng-include="'recurse'"> </li>
</ul>
- },</br>
+ }
+ <span ng-if="!$last">,</span>
+ </br>
</span>
<span ng-if="!isObject(val) && !isArray(val)">
- {{val}}
+ {{val | json }}
+ <span ng-if="!$last">,</span>
</span>
</div>
]
@@ -42,6 +45,8 @@
<span ng-if="!isObject(value) && !isArray(value)">
<a ng-if="key.indexOf('@odata.id') != -1" ng-href="#{{value}}">"{{value}}"</a>
-<span ng-if="key.indexOf('@odata.id') == -1" ng-href="#{{value}}">{{value | json}}</span>,
+<span ng-if="key.indexOf('@odata.id') == -1" ng-href="#{{value}}">{{value | json}}</span>
</span>
+<span ng-if="!$last">,</span>
+</br>
</script>
OpenPOWER on IntegriCloud