apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-04 00:02:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 8450: handle invalid JSON string returned by API call.

Browse Source
This commit is contained in:
Jessica Wang 2011-02-22 18:08:43 -08:00
parent 1d8eab2a11
commit 1ff7e72eef
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ui/scripts/cloud.core.js
View File

@ -1222,18 +1222,33 @@ function handleErrorInDialog2(errorMsg, $thisDialog) {
$infoContainer.show(); $infoContainer.show();
} }
function parseXMLHttpResponse(XMLHttpResponse) { function parseXMLHttpResponse(XMLHttpResponse) {
var json = jQuery.parseJSON(XMLHttpResponse.responseText); if(isValidJsonString(XMLHttpResponse.responseText) == false) {
return "";
}
//var json = jQuery.parseJSON(XMLHttpResponse.responseText);
var json = JSON.parse(XMLHttpResponse.responseText);
if (json != null) { if (json != null) {
var property; var property;
for(property in json) {} for(property in json) {}
var errorObj = json[property]; var errorObj = json[property];
return fromdb(errorObj.errortext); return fromdb(errorObj.errortext);
} else { } else {
return null; return "";
} }
} }
function isValidJsonString(str) {
try {
JSON.parse(str);
}
catch (e) {
return false;
}
return true;
}
function showLeftNavigationBasedOnRole() { function showLeftNavigationBasedOnRole() {
if (isAdmin()) { if (isAdmin()) {
$("#leftmenu_domain, #leftmenu_account, #leftmenu_configuration, #leftmenu_system, #leftmenu_alert_container, #launch_test").show(); $("#leftmenu_domain, #leftmenu_account, #leftmenu_configuration, #leftmenu_system, #leftmenu_alert_container, #launch_test").show();