diff --git a/ui/jsp/systemvm.jsp b/ui/jsp/systemvm.jsp index 3e860d20a3b..7b37e5b4216 100644 --- a/ui/jsp/systemvm.jsp +++ b/ui/jsp/systemvm.jsp @@ -25,154 +25,156 @@
- +
+
+
+
+ (title)
+ +
+
+
+

+ Detaching Disk …

+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+

+

+
+
+
+
+
+
+ <%=t.t("system.vm.type")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("zone")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("ID")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("name")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("active.sessions")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("public.ip")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("private.ip")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("host")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("gateway")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("created")%>:
+
+
+
+
+
+
+
+
diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js index b4453512064..bd488771753 100644 --- a/ui/scripts/cloud.core.init.js +++ b/ui/scripts/cloud.core.init.js @@ -126,6 +126,7 @@ $(document).ready(function() { bindAndListMidMenuItems($("#leftmenu_disk_offering"), "listDiskOfferings", "listdiskofferingsresponse", "diskoffering", "jsp/diskoffering.jsp", afterLoadDiskOfferingJSP, diskOfferingToMidmenu, diskOfferingToRightPanel, getMidmenuId, false); bindAndListMidMenuItems($("#leftmenu_submenu_virtual_router"), "listRouters", "listroutersresponse", "router", "jsp/router.jsp", afterLoadRouterJSP, routerToMidmenu, routerToRightPanel, getMidmenuId, false); + bindAndListMidMenuItems($("#leftmenu_submenu_systemvm"), "listSystemVms", "listsystemvmsresponse", "systemvm", "jsp/systemvm.jsp", afterLoadSystemVmJSP, systemvmToMidmenu, systemvmToRightPanel, getMidmenuId, false); $("#leftmenu_global_setting").bind("click", function(event) { selectLeftSubMenu($(this)); diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js index 7746522c581..bbecd864db8 100644 --- a/ui/scripts/cloud.core.js +++ b/ui/scripts/cloud.core.js @@ -937,7 +937,7 @@ function listMidMenuItems2(commandString, jsonResponse1, jsonResponse2, toMidmen var items = json[jsonResponse1][jsonResponse2]; if(items != null && items.length > 0) { for(var i=0; i 0) { - item = items[0]; - } - } - }); - - $leftmenuItem1.data("jsonObj", item); - systemvmJsonToRightPanel($leftmenuItem1); + afterActionSeccessFn: function(json, $midmenuItem1, id) { + var jsonObj = json.queryasyncjobresultresponse.jobresult.systemvm; + systemvmToMidmenu(jsonObj, $midmenuItem1); + systemvmToRightPanel($midmenuItem1); } }, "Reboot System VM": { @@ -125,23 +135,10 @@ var systemVmActionMap = { asyncJobResponse: "rebootsystemvmresponse", inProcessText: "Rebooting System VM....", dialogBeforeActionFn : doRebootSystemVM, - afterActionSeccessFn: function(json, $leftmenuItem1, id) { - //var item = json.queryasyncjobresultresponse.jobresult.rebootsystemvmresponse; //waiting for Bug 6860 to be fixed ("RebootSystemVM should return an embedded object on success") - var item; - $.ajax({ - data: createURL("command=listSystemVms&id="+id), - dataType: "json", - async: false, - success: function(json) { - var items = json.listsystemvmsresponse.systemvm; - if (items != null && items.length > 0) { - item = items[0]; - } - } - }); - - $leftmenuItem1.data("jsonObj", item); - systemvmJsonToRightPanel($leftmenuItem1); + afterActionSeccessFn: function(json, $midmenuItem1, id) { + var jsonObj = json.queryasyncjobresultresponse.jobresult.systemvm; + systemvmToMidmenu(jsonObj, $midmenuItem1); + systemvmToRightPanel($midmenuItem1); } } }