apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

new UI - fix a bug that action info (succeed or fail) didn't show on top of right panel after action was finished.

Browse Source
This commit is contained in:
Jessica Wang 2010-10-24 15:03:06 -07:00
parent 36fd8edb85
commit d3fa609123
17 changed files with 64 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/new/jsp/account.jsp
View File

@ -14,7 +14,7 @@
Accounts</h1>
</div>
<div class="contentbox" id="right_panel_content">
<div class="info_detailbox errorbox" id="after_action_info_container" style="display: none">
<div class="info_detailbox errorbox" id="after_action_info_container_on_top" style="display: none">
<p id="after_action_info">
</p>
</div>

5
ui/new/jsp/alert.jsp
View File

@ -16,8 +16,9 @@
</h1>
</div>
<div class="contentbox" id="right_panel_content">
<div class="info_detailbox errorbox" id="after_action_info_container" style="display:none">
<p id="after_action_info"></p>
<div class="info_detailbox errorbox" id="after_action_info_container_on_top" style="display: none">
<p id="after_action_info">
</p>
</div>
<div class="tabbox" style="margin-top:15px;">
<div class="content_tabs on">

2
ui/new/jsp/diskoffering.jsp
View File

@ -17,7 +17,7 @@
</h1>
</div>
<div class="contentbox" id="right_panel_content">
<div class="info_detailbox errorbox" id="after_action_info_container" style="display: none">
<div class="info_detailbox errorbox" id="after_action_info_container_on_top" style="display: none">
<p id="after_action_info">
</p>
</div>

2
ui/new/jsp/domain.jsp
View File

@ -17,7 +17,7 @@
</h1>
</div>
<div class="contentbox" id="right_panel_content">
<div class="info_detailbox errorbox" id="after_action_info_container" style="display: none">
<div class="info_detailbox errorbox" id="after_action_info_container_on_top" style="display: none">
<p id="after_action_info">
</p>
</div>

5
ui/new/jsp/event.jsp
View File

@ -16,8 +16,9 @@
</h1>
</div>
<div class="contentbox" id="right_panel_content">
<div class="info_detailbox errorbox" id="after_action_info_container" style="display:none">
<p id="after_action_info"></p>
<div class="info_detailbox errorbox" id="after_action_info_container_on_top" style="display: none">
<p id="after_action_info">
</p>
</div>
<div class="tabbox" style="margin-top:15px;">
<div class="content_tabs on">

2
ui/new/jsp/globalsetting.jsp
View File

@ -17,7 +17,7 @@
</h1>
</div>
<div class="contentbox" id="right_panel_content">
<div class="info_detailbox errorbox" id="after_action_info_container" style="display: none">
<div class="info_detailbox errorbox" id="after_action_info_container_on_top" style="display: none">
<p id="after_action_info">
</p>
</div>

2
ui/new/jsp/instance.jsp
View File

@ -15,7 +15,7 @@
</h1>
</div>
<div class="contentbox" id="right_panel_content">
<div class="info_detailbox errorbox" id="after_action_info_container" style="display: none">
<div class="info_detailbox errorbox" id="after_action_info_container_on_top" style="display: none">
<p id="after_action_info">
</p>
</div>

2
ui/new/jsp/ipaddress.jsp
View File

@ -15,7 +15,7 @@
</h1>
</div>
<div class="contentbox" id="right_panel_content">
<div class="info_detailbox errorbox" id="after_action_info_container" style="display: none">
<div class="info_detailbox errorbox" id="after_action_info_container_on_top" style="display: none">
<p id="after_action_info">
</p>
</div>

2
ui/new/jsp/iso.jsp
View File

@ -15,7 +15,7 @@
</h1>
</div>
<div class="contentbox" id="right_panel_content">
<div class="info_detailbox errorbox" id="after_action_info_container" style="display: none">
<div class="info_detailbox errorbox" id="after_action_info_container_on_top" style="display: none">
<p id="after_action_info">
</p>
</div>

2
ui/new/jsp/resource.jsp
View File

@ -16,7 +16,7 @@
</h1>
</div>
<div class="contentbox" id="right_panel_content">
<div class="info_detailbox errorbox" id="after_action_info_container" style="display: none">
<div class="info_detailbox errorbox" id="after_action_info_container_on_top" style="display: none">
<p id="after_action_info">
</p>
</div>

2
ui/new/jsp/router.jsp
View File

@ -17,7 +17,7 @@
</h1>
</div>
<div class="contentbox" id="right_panel_content">
<div class="info_detailbox errorbox" id="after_action_info_container" style="display: none">
<div class="info_detailbox errorbox" id="after_action_info_container_on_top" style="display: none">
<p id="after_action_info">
</p>
</div>

2
ui/new/jsp/serviceoffering.jsp
View File

@ -17,7 +17,7 @@
</h1>
</div>
<div class="contentbox" id="right_panel_content">
<div class="info_detailbox errorbox" id="after_action_info_container" style="display: none">
<div class="info_detailbox errorbox" id="after_action_info_container_on_top" style="display: none">
<p id="after_action_info">
</p>
</div>

2
ui/new/jsp/snapshot.jsp
View File

@ -15,7 +15,7 @@
</h1>
</div>
<div class="contentbox" id="right_panel_content">
<div class="info_detailbox errorbox" id="after_action_info_container" style="display: none">
<div class="info_detailbox errorbox" id="after_action_info_container_on_top" style="display: none">
<p id="after_action_info">
</p>
</div>

2
ui/new/jsp/template.jsp
View File

@ -15,7 +15,7 @@
</h1>
</div>
<div class="contentbox" id="right_panel_content">
<div class="info_detailbox errorbox" id="after_action_info_container" style="display: none">
<div class="info_detailbox errorbox" id="after_action_info_container_on_top" style="display: none">
<p id="after_action_info">
</p>
</div>

2
ui/new/jsp/volume.jsp
View File

@ -17,7 +17,7 @@
</h1>
</div>
<div class="contentbox" id="right_panel_content">
<div class="info_detailbox errorbox" id="after_action_info_container" style="display: none">
<div class="info_detailbox errorbox" id="after_action_info_container_on_top" style="display: none">
<p id="after_action_info">
</p>
</div>

36
ui/new/scripts/cloud.core2.instance.js
View File

@ -656,6 +656,7 @@ var vmActionMap = {
api: "stopVirtualMachine",
isAsyncJob: true,
asyncJobResponse: "stopvirtualmachineresponse",
inProcessText: "Stopping Instance....",
afterActionSeccessFn: function(json, $midmenuItem1, id) {
//call listVirtualMachine to get embedded object until bug 6486 ("StopVirtualMachine API should return an embedded object on success") is fixed.
var jsonObj;
@ -676,8 +677,9 @@ var vmActionMap = {
api: "startVirtualMachine",
isAsyncJob: true,
asyncJobResponse: "startvirtualmachineresponse",
inProcessText: "Starting Instance....",
afterActionSeccessFn: function(json, $midmenuItem1, id) {
var jsonObj = json.queryasyncjobresultresponse.virtualmachine[0];
var jsonObj = json.queryasyncjobresultresponse.jobresult.startvirtualmachineresponse;
vmToMidmenu(jsonObj, $midmenuItem1);
vmToRightPanel($midmenuItem1);
}
@ -686,6 +688,7 @@ var vmActionMap = {
api: "rebootVirtualMachine",
isAsyncJob: true,
asyncJobResponse: "rebootvirtualmachineresponse",
inProcessText: "Rebooting Instance....",
afterActionSeccessFn: function(json, $midmenuItem1, id) {
var jsonObj = json.queryasyncjobresultresponse.virtualmachine[0];
vmToMidmenu(jsonObj, $midmenuItem1);
@ -696,6 +699,7 @@ var vmActionMap = {
api: "destroyVirtualMachine",
isAsyncJob: true,
asyncJobResponse: "destroyvirtualmachineresponse",
inProcessText: "Destroying Instance....",
afterActionSeccessFn: function(json, $midmenuItem1, id) {
//call listVirtualMachine to get embedded object until bug 6041 ("DestroyVirtualMachine API should return an embedded object on success") is fixed.
var id = $midmenuItem1.data("jsonObj").id;
@ -716,6 +720,7 @@ var vmActionMap = {
"Restore Instance": {
api: "recoverVirtualMachine",
isAsyncJob: false,
inProcessText: "Restoring Instance....",
afterActionSeccessFn: function(json, $midmenuItem1, id) {
//call listVirtualMachine to get embedded object until bug 6037 ("RecoverVirtualMachine API should return an embedded object on success") is fixed.
var id = $midmenuItem1.data("jsonObj").id;
@ -735,7 +740,8 @@ var vmActionMap = {
},
"Attach ISO": {
isAsyncJob: true,
asyncJobResponse: "attachisoresponse",
asyncJobResponse: "attachisoresponse",
inProcessText: "Attaching ISO....",
dialogBeforeActionFn : doAttachISO,
afterActionSeccessFn: function(json, $midmenuItem1, id) {
//call listVirtualMachine to get embedded object until bug 6487 ("AttachISO API should return an embedded object on success") is fixed.
@ -756,7 +762,8 @@ var vmActionMap = {
},
"Detach ISO": {
isAsyncJob: true,
asyncJobResponse: "detachisoresponse",
asyncJobResponse: "detachisoresponse",
inProcessText: "Detaching ISO....",
dialogBeforeActionFn : doDetachISO,
afterActionSeccessFn: function(json, $midmenuItem1, id) {
//call listVirtualMachine to get embedded object until bug 6488 ("Detach ISO API should return an embedded object on success") is fixed.
@ -779,7 +786,8 @@ var vmActionMap = {
dialogBeforeActionFn : doResetPassword
},
"Change Name": {
isAsyncJob: false,
isAsyncJob: false,
inProcessText: "Changing Name....",
dialogBeforeActionFn : doChangeName,
afterActionSeccessFn: function(json, $midmenuItem1, id) {
//call listVirtualMachine to get embedded object until bug 6489 ("updateVirtualMachine API should return an embedded object on success") is fixed.
@ -799,7 +807,8 @@ var vmActionMap = {
}
},
"Change Group": {
isAsyncJob: false,
isAsyncJob: false,
inProcessText: "Changing Group....",
dialogBeforeActionFn : doChangeGroup,
afterActionSeccessFn: function(json, $midmenuItem1, id) {
//call listVirtualMachine to get embedded object until bug 6489 ("updateVirtualMachine API should return an embedded object on success") is fixed.
@ -821,6 +830,7 @@ var vmActionMap = {
"Change Service": {
isAsyncJob: true,
asyncJobResponse: "changeserviceforvirtualmachineresponse",
inProcessText: "Changing Service....",
dialogBeforeActionFn : doChangeService,
afterActionSeccessFn: function(json, $midmenuItem1, id) {
var jsonObj = json.queryasyncjobresultresponse.virtualmachine[0];
@ -829,7 +839,8 @@ var vmActionMap = {
}
},
"Enable HA": {
isAsyncJob: false,
isAsyncJob: false,
inProcessText: "Enabling HA....",
dialogBeforeActionFn : doEnableHA,
afterActionSeccessFn: function(json, $midmenuItem1, id) {
//call listVirtualMachine to get embedded object until bug 6489 ("updateVirtualMachine API should return an embedded object on success") is fixed.
@ -849,7 +860,8 @@ var vmActionMap = {
}
},
"Disable HA": {
isAsyncJob: false,
isAsyncJob: false,
inProcessText: "Disabling HA....",
dialogBeforeActionFn : doDisableHA,
afterActionSeccessFn: function(json, $midmenuItem1, id) {
//call listVirtualMachine to get embedded object until bug 6489 ("updateVirtualMachine API should return an embedded object on success") is fixed.
@ -985,9 +997,10 @@ function doResetPassword2(id, $midmenuItem1) {
$midmenuItem1.find("#content").removeClass("inaction");
$midmenuItem1.find("#spinning_wheel").hide();
if (result.jobstatus == 1) { // Succeeded
$midmenuItem1.find("#info_icon").removeClass("error").show();
$midmenuItem1.find("#second_row").text("New password: " + result.virtualmachine[0].password);
var afterActionInfo = "Your password has been successfully resetted. Your new password is : " + result.virtualmachine[0].password;
$midmenuItem1.find("#info_icon").removeClass("error").show();
var item = result.jobresult.resetpasswordforvirtualmachineresponse;
$midmenuItem1.find("#second_row").text("New password: " + item.password);
var afterActionInfo = "Your password has been successfully resetted. Your new password is : " + item.password;
$midmenuItem1.data("afterActionInfo", afterActionInfo);
} else if (result.jobstatus == 2) { // Failed
$midmenuItem1.find("#info_icon").addClass("error").show();
@ -1174,6 +1187,8 @@ function vmToRightPanel($midmenuItem1) {
var vmName = getVmName(jsonObj.name, jsonObj.displayname);
$("right_panel_header").find("#vm_name").text(vmName);
//Comment the following code which is for middle menu action, not details tab action.
/*
var $rightPanelContent = $("#right_panel_content");
if($midmenuItem1.find("#info_icon").css("display") != "none") {
$rightPanelContent.find("#after_action_info").text($midmenuItem1.data("afterActionInfo"));
@ -1187,6 +1202,7 @@ function vmToRightPanel($midmenuItem1) {
$rightPanelContent.find("#after_action_info").text("");
$rightPanelContent.find("#after_action_info_container").hide();
}
*/
vmJsonToDetailsTab($midmenuItem1);
vmJsonToVolumeTab(jsonObj);

35
ui/new/scripts/cloud.core2.js
View File

@ -58,7 +58,9 @@ function doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detai
var $spinningWheel = $detailsTab.find("#spinning_wheel");
$spinningWheel.find("#description").text(inProcessText);
$spinningWheel.show();
$("#right_panel_content #after_action_info_container").removeClass("errorbox").hide();
var $afterActionInfoContainer = $("#right_panel_content #after_action_info_container_on_top");
$afterActionInfoContainer.removeClass("errorbox").hide();
//Async job (begin) *****
if(isAsyncJob == true) {
@ -81,20 +83,20 @@ function doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detai
return; //Job has not completed
} else {
$("body").stopTime(timerKey);
$spinningWheel.hide();
$spinningWheel.hide();
if (result.jobstatus == 1) { // Succeeded
$("#right_panel_content #after_action_info").text(label + " action succeeded.");
$("#right_panel_content #after_action_info_container").removeClass("errorbox").show();
$afterActionInfoContainer.find("#after_action_info").text(label + " action succeeded.");
$afterActionInfoContainer.removeClass("errorbox").show();
afterActionSeccessFn(json, $midmenuItem1, id);
} else if (result.jobstatus == 2) { // Failed
$("#right_panel_content #after_action_info").text(label + " action failed. Reason: " + fromdb(result.jobresult));
$("#right_panel_content #after_action_info_container").addClass("errorbox").show();
$afterActionInfoContainer.find("#after_action_info").text(label + " action failed. Reason: " + fromdb(result.jobresult));
$afterActionInfoContainer.addClass("errorbox").show();
}
}
},
error: function(XMLHttpResponse) {
$("body").stopTime(timerKey);
handleErrorInDetailsTab(XMLHttpResponse, $detailsTab, label);
handleErrorInDetailsTab(XMLHttpResponse, $detailsTab, label, $afterActionInfoContainer);
}
});
},
@ -102,7 +104,7 @@ function doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detai
);
},
error: function(XMLHttpResponse) {
handleErrorInDetailsTab(XMLHttpResponse, $detailsTab, label);
handleErrorInDetailsTab(XMLHttpResponse, $detailsTab, label, $afterActionInfoContainer);
}
});
}
@ -116,19 +118,19 @@ function doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detai
async: false,
success: function(json) {
$spinningWheel.hide();
$("#right_panel_content #after_action_info").text(label + " action succeeded.");
$("#right_panel_content #after_action_info_container").removeClass("errorbox").show();
$afterActionInfoContainer.find("#after_action_info").text(label + " action succeeded.");
$afterActionInfoContainer.removeClass("errorbox").show();
afterActionSeccessFn(json, $midmenuItem1, id);
},
error: function(XMLHttpResponse) {
handleErrorInDetailsTab(XMLHttpResponse, $detailsTab, label);
handleErrorInDetailsTab(XMLHttpResponse, $detailsTab, label, $afterActionInfoContainer);
}
});
}
//Sync job (end) *****
}
function handleErrorInDetailsTab(XMLHttpResponse, $detailsTab, label) {
function handleErrorInDetailsTab(XMLHttpResponse, $detailsTab, label, $afterActionInfoContainer) {
$detailsTab.find("#spinning_wheel").hide();
var errorMsg = "";
@ -136,12 +138,13 @@ function handleErrorInDetailsTab(XMLHttpResponse, $detailsTab, label) {
var start = XMLHttpResponse.responseText.indexOf("h1") + 3;
var end = XMLHttpResponse.responseText.indexOf("</h1");
errorMsg = XMLHttpResponse.responseText.substring(start, end);
}
}
if(errorMsg.length > 0)
$("#right_panel_content #after_action_info").text(label + " action failed. Reason: " + fromdb(errorMsg));
$afterActionInfoContainer.find("#after_action_info").text(label + " action failed. Reason: " + fromdb(errorMsg));
else
$("#right_panel_content #after_action_info").text(label + " action failed.");
$("#right_panel_content #after_action_info_container").addClass("errorbox").show();
$afterActionInfoContainer.find("#after_action_info").text(label + " action failed.");
$afterActionInfoContainer.addClass("errorbox").show();
}
//***** actions for details tab in right panel (end) **************************************************************************