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

new UI - Virtual Router page - Start/Stop/Reboot SystemVM API return objects in different structure. This is related UI change.

Browse Source
This commit is contained in:
Jessica Wang 2010-11-09 10:29:06 -08:00
parent e43514d1de
commit 5cf998bcb0
2 changed files with 31 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ui/scripts/cloud.core.iso.js
View File

@ -196,37 +196,10 @@ function isoJsonToDetailsTab() {
$thisTab.find("#tab_container").hide();
$thisTab.find("#tab_spinning_wheel").show();
var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
var jsonObj = $midmenuItem1.data("jsonObj");
//listIsos API has a bug => it returns nothing when id is 200(xs-tools.iso) and zoneid is specified. So, comment the following code before the bug is fixed.
/*
var array1 = [];
var id = $midmenuItem1.data("jsonObj").id;
array1.push("&id="+id);
var zoneid = $midmenuItem1.data("jsonObj").zoneid;
if(zoneid != null)
array1.push("&zoneid="+zoneid);
var jsonObj;
$.ajax({
data: createURL("command=listIsos&isofilter=self"+array1.join("")),
dataType: "json",
async: false,
success: function(json) {
var items = json.listisosresponse.iso;
if(items != null && items.length > 0)
jsonObj = items[0];
}
});
*/
var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
var jsonObj = $midmenuItem1.data("jsonObj");
$thisTab.data("jsonObj", jsonObj);
$midmenuItem1.data("jsonObj", jsonObj);
$thisTab.find("#id").text(fromdb(jsonObj.id));
$thisTab.find("#zonename").text(fromdb(jsonObj.zonename));

54
ui/scripts/cloud.core.router.js
View File

@ -19,7 +19,13 @@
function afterLoadRouterJSP() {
}
function routerAfterDetailsTabAction(json, $midmenuItem1, id) {
var jsonObj = json.queryasyncjobresultresponse.jobresult.domainrouter;
routerToMidmenu(jsonObj, $midmenuItem1);
routerJsonToDetailsTab($midmenuItem1);
}
function routerToMidmenu(jsonObj, $midmenuItem1) {
$midmenuItem1.attr("id", getMidmenuId(jsonObj));
$midmenuItem1.data("jsonObj", jsonObj);
@ -29,15 +35,10 @@ function routerToMidmenu(jsonObj, $midmenuItem1) {
updateVmStateInMidMenu(jsonObj, $midmenuItem1);
}
function routerAfterDetailsTabAction(json, $midmenuItem1, id) {
var jsonObj = json.queryasyncjobresultresponse.router[0];
routerToMidmenu(jsonObj, $midmenuItem1);
routerJsonToDetailsTab($midmenuItem1);
}
function routerToRightPanel($midmenuItem1) {
copyActionInfoFromMidMenuToRightPanel($midmenuItem1);
routerJsonToDetailsTab($midmenuItem1);
$("#right_panel_content").data("$midmenuItem1", $midmenuItem1);
routerJsonToDetailsTab();
}
function routerJsonToDetailsTab($midmenuItem1) {
@ -45,22 +46,23 @@ function routerJsonToDetailsTab($midmenuItem1) {
$thisTab.find("#tab_container").hide();
$thisTab.find("#tab_spinning_wheel").show();
var jsonObj = $midmenuItem1.data("jsonObj");
var $detailsTab = $("#right_panel_content #tab_content_details");
$detailsTab.data("jsonObj", jsonObj);
setVmStateInRightPanel(jsonObj.state, $detailsTab.find("#state"));
$detailsTab.find("#ipAddress").text(jsonObj.publicip);
$detailsTab.find("#zonename").text(fromdb(jsonObj.zonename));
$detailsTab.find("#name").text(fromdb(jsonObj.name));
$detailsTab.find("#publicip").text(fromdb(jsonObj.publicip));
$detailsTab.find("#privateip").text(fromdb(jsonObj.privateip));
$detailsTab.find("#guestipaddress").text(fromdb(jsonObj.guestipaddress));
$detailsTab.find("#hostname").text(fromdb(jsonObj.hostname));
$detailsTab.find("#networkdomain").text(fromdb(jsonObj.networkdomain));
$detailsTab.find("#account").text(fromdb(jsonObj.account));
setDateField(jsonObj.created, $detailsTab.find("#created"));
var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
var jsonObj = $midmenuItem1.data("jsonObj");
$thisTab.data("jsonObj", jsonObj);
setVmStateInRightPanel(jsonObj.state, $thisTab.find("#state"));
$thisTab.find("#ipAddress").text(jsonObj.publicip);
$thisTab.find("#zonename").text(fromdb(jsonObj.zonename));
$thisTab.find("#name").text(fromdb(jsonObj.name));
$thisTab.find("#publicip").text(fromdb(jsonObj.publicip));
$thisTab.find("#privateip").text(fromdb(jsonObj.privateip));
$thisTab.find("#guestipaddress").text(fromdb(jsonObj.guestipaddress));
$thisTab.find("#hostname").text(fromdb(jsonObj.hostname));
$thisTab.find("#networkdomain").text(fromdb(jsonObj.networkdomain));
$thisTab.find("#account").text(fromdb(jsonObj.account));
setDateField(jsonObj.created, $thisTab.find("#created"));
resetViewConsoleAction(jsonObj, $detailsTab);
resetViewConsoleAction(jsonObj, $thisTab);
//***** actions (begin) *****
var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu");
@ -68,12 +70,12 @@ function routerJsonToDetailsTab($midmenuItem1) {
var noAvailableActions = true;
if (jsonObj.state == 'Running') {
buildActionLinkForTab("Stop Router", routerActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Reboot Router", routerActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Stop Router", routerActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Reboot Router", routerActionMap, $actionMenu, $midmenuItem1, $thisTab);
noAvailableActions = false;
}
else if (jsonObj.state == 'Stopped') {
buildActionLinkForTab("Start Router", routerActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Start Router", routerActionMap, $actionMenu, $midmenuItem1, $thisTab);
noAvailableActions = false;
}