From cb8e23fa3359e8a259d16d4e874f1b605d9d484e Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 29 Jun 2011 20:05:24 -0700 Subject: [PATCH] bug 10500: cloudStack - periodically Check non-Complete-AsyncJob - Only popup dialog when getting action label succeeds. --- ui/scripts/cloud.core.js | 57 +++++++++++++++++++++------------------- 1 file changed, 30 insertions(+), 27 deletions(-) diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js index 1b3f802b3de..17c0a420ea5 100644 --- a/ui/scripts/cloud.core.js +++ b/ui/scripts/cloud.core.js @@ -36,38 +36,41 @@ function periodicallyCheckNonCompleteAsyncJob() { } else { var label2 = g_nonCompleteAsyncJob[jobId]; - delete g_nonCompleteAsyncJob[jobId]; - var afterActionInfo; - if (result.jobstatus == 1) { // Succeeded - afterActionInfo = (label2 + " - " + g_dictionary["label.succeeded"]); - } - else if (result.jobstatus == 2) { // Failed - afterActionInfo = label2 + " - " + g_dictionary["label.failed"] + " - " + fromdb(result.jobresult.errortext); - } - - $("#dialog_action_complete") - .text(afterActionInfo) - .dialog("open"); + delete g_nonCompleteAsyncJob[jobId]; + if(label2 != null) { + var afterActionInfo; + if (result.jobstatus == 1) { // Succeeded + afterActionInfo = (label2 + " - " + g_dictionary["label.succeeded"]); + } + else if (result.jobstatus == 2) { // Failed + afterActionInfo = label2 + " - " + g_dictionary["label.failed"] + " - " + fromdb(result.jobresult.errortext); + } + + $("#dialog_action_complete") + .text(afterActionInfo) + .dialog("open"); + } } }, error: function(XMLHttpResponse) { var label2 = g_nonCompleteAsyncJob[jobId]; delete g_nonCompleteAsyncJob[jobId]; - - var errorMsg = ""; - if(XMLHttpResponse.responseText != null & XMLHttpResponse.responseText.length > 0) { - errorMsg = parseXMLHttpResponse(XMLHttpResponse); - } - - var afterActionInfo; - if(errorMsg.length > 0) - afterActionInfo = label2 + " - " + g_dictionary["label.failed"] + " - " + errorMsg; - else - afterActionInfo = label2 + " - " + g_dictionary["label.failed"]; - - $("#dialog_action_complete") - .text(afterActionInfo) - .dialog("open"); + if(label2 != null) { + var errorMsg = ""; + if(XMLHttpResponse.responseText != null & XMLHttpResponse.responseText.length > 0) { + errorMsg = parseXMLHttpResponse(XMLHttpResponse); + } + + var afterActionInfo; + if(errorMsg.length > 0) + afterActionInfo = label2 + " - " + g_dictionary["label.failed"] + " - " + errorMsg; + else + afterActionInfo = label2 + " - " + g_dictionary["label.failed"]; + + $("#dialog_action_complete") + .text(afterActionInfo) + .dialog("open"); + } } }); }