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 - change function names since the 2 functions are not only used by details tab, but also other tabs (e.g. resource limits tab).

Browse Source
This commit is contained in:
Jessica Wang 2010-11-05 10:12:48 -07:00
parent 1c8f42a001
commit 853f6610c2
16 changed files with 114 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui/scripts/cloud.core.account.js
View File

@ -69,17 +69,17 @@ function accountJsonToDetailsTab($midmenuItem1) {
if(jsonObj.id != systemAccountId && jsonObj.id != adminAccountId) {
if (jsonObj.accounttype == roleTypeUser || jsonObj.accounttype == roleTypeDomainAdmin) {
buildActionLinkForDetailsTab("Resource limits", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Resource limits", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab);
noAvailableActions = false;
}
if(jsonObj.state == "enabled") {
buildActionLinkForDetailsTab("Disable account", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForDetailsTab("Lock account", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Disable account", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Lock account", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab);
noAvailableActions = false;
}
else if(jsonObj.state == "disabled" || jsonObj.state == "locked") {
buildActionLinkForDetailsTab("Enable account", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Enable account", accountActionMap, $actionMenu, $midmenuItem1, $detailsTab);
noAvailableActions = false;
}
}
@ -260,7 +260,7 @@ function doDisableAccount($actionLink, $detailsTab, $midmenuItem1) {
"Yes": function() {
$(this).dialog("close");
var apiCommand = "command=disableAccount&account="+jsonObj.name+"&domainId="+jsonObj.domainid;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab) ;
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab) ;
},
"Cancel": function() {
$(this).dialog("close");
@ -276,7 +276,7 @@ function doLockAccount($actionLink, $detailsTab, $midmenuItem1) {
"Yes": function() {
$(this).dialog("close");
var apiCommand = "command=lockAccount&account="+jsonObj.name+"&domainId="+jsonObj.domainid;
doActionToDetailsTab(jsonObj.id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(jsonObj.id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");
@ -292,7 +292,7 @@ function doEnableAccount($actionLink, $detailsTab, $midmenuItem1) {
"Yes": function() {
$(this).dialog("close");
var apiCommand = "command=enableAccount&account="+jsonObj.name+"&domainId="+jsonObj.domainid;
doActionToDetailsTab(jsonObj.id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(jsonObj.id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");

4
ui/scripts/cloud.core.diskoffering.js
View File

@ -228,8 +228,8 @@ function diskOfferingJsonToDetailsTab() {
//actions ***
var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu");
$actionMenu.find("#action_list").empty();
buildActionLinkForDetailsTab("Edit Disk Offering", diskOfferingActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForDetailsTab("Delete Disk Offering", diskOfferingActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Edit Disk Offering", diskOfferingActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Delete Disk Offering", diskOfferingActionMap, $actionMenu, $midmenuItem1, $thisTab);
$thisTab.find("#tab_spinning_wheel").hide();
$thisTab.find("#tab_container").show();

2
ui/scripts/cloud.core.domain.js
View File

@ -262,7 +262,7 @@ function domainToResourceLimitsTab() {
var $actionMenu = $thisTab.find("#action_link #action_menu");
$actionMenu.find("#action_list").empty();
buildActionLinkForDetailsTab("Edit Resource Limits", domainResourceLimitsActionMap, $actionMenu, $leftmenuItem1, $thisTab);
buildActionLinkForTab("Edit Resource Limits", domainResourceLimitsActionMap, $actionMenu, $leftmenuItem1, $thisTab);
}
function bindEventHandlerToDomainTreeNode() {

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

@ -90,42 +90,42 @@ function hostJsonToDetailsTab($midmenuItem1) {
var noAvailableActions = true;
if (jsonObj.state == 'Up' || jsonObj.state == "Connecting") {
buildActionLinkForDetailsTab("Enable Maintenance Mode", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForDetailsTab("Force Reconnect", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForDetailsTab("Update OS Preference", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Enable Maintenance Mode", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Force Reconnect", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Update OS Preference", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
noAvailableActions = false;
}
else if(jsonObj.state == 'Down') {
buildActionLinkForDetailsTab("Enable Maintenance Mode", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForDetailsTab("Update OS Preference", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForDetailsTab("Remove Host", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Enable Maintenance Mode", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Update OS Preference", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Remove Host", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
noAvailableActions = false;
}
else if(jsonObj.state == "Alert") {
buildActionLinkForDetailsTab("Update OS Preference", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Update OS Preference", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
noAvailableActions = false;
}
else if (jsonObj.state == "ErrorInMaintenance") {
buildActionLinkForDetailsTab("Enable Maintenance Mode", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForDetailsTab("Cancel Maintenance Mode", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForDetailsTab("Update OS Preference", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Enable Maintenance Mode", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Cancel Maintenance Mode", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Update OS Preference", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
noAvailableActions = false;
}
else if (jsonObj.state == "PrepareForMaintenance") {
buildActionLinkForDetailsTab("Cancel Maintenance Mode", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForDetailsTab("Update OS Preference", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Cancel Maintenance Mode", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Update OS Preference", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
noAvailableActions = false;
}
else if (jsonObj.state == "Maintenance") {
buildActionLinkForDetailsTab("Cancel Maintenance Mode", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForDetailsTab("Update OS Preference", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForDetailsTab("Remove Host", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Cancel Maintenance Mode", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Update OS Preference", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Remove Host", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
noAvailableActions = false;
}
else if (jsonObj.state == "Disconnected"){
buildActionLinkForDetailsTab("Update OS Preference", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForDetailsTab("Remove Host", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Update OS Preference", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Remove Host", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
noAvailableActions = false;
}
else {
@ -134,11 +134,11 @@ function hostJsonToDetailsTab($midmenuItem1) {
//temporary for testing (begin) *****
/*
buildActionLinkForDetailsTab("Enable Maintenance Mode", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForDetailsTab("Cancel Maintenance Mode", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForDetailsTab("Force Reconnect", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForDetailsTab("Remove Host", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForDetailsTab("Update OS Preference", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Enable Maintenance Mode", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Cancel Maintenance Mode", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Force Reconnect", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Remove Host", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Update OS Preference", hostActionMap, $actionMenu, $midmenuItem1, $detailsTab);
noAvailableActions = false;
*/
//temporary for testing (begin) *****
@ -266,7 +266,7 @@ function doEnableMaintenanceMode($actionLink, $detailsTab, $midmenuItem1){
$(this).dialog("close");
var id = jsonObj.id;
var apiCommand = "command=prepareHostForMaintenance&id="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");
@ -283,7 +283,7 @@ function doCancelMaintenanceMode($actionLink, $detailsTab, $midmenuItem1){
$(this).dialog("close");
var id = jsonObj.id;
var apiCommand = "command=cancelHostMaintenance&id="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");
@ -300,7 +300,7 @@ function doForceReconnect($actionLink, $detailsTab, $midmenuItem1){
$(this).dialog("close");
var id = jsonObj.id;
var apiCommand = "command=reconnectHost&id="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");
@ -317,7 +317,7 @@ function doRemoveHost($actionLink, $detailsTab, $midmenuItem1){
$(this).dialog("close");
var id = jsonObj.id;
var apiCommand = "command=deleteHost&id="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");
@ -340,7 +340,7 @@ function doUpdateOSPreference($actionLink, $detailsTab, $midmenuItem1){
var id = jsonObj.id;
var apiCommand = "command=updateHost&id="+id+"&osCategoryId="+osId;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");

46
ui/scripts/cloud.core.instance.js
View File

@ -1094,7 +1094,7 @@ function doStartVM($actionLink, $detailsTab, $midmenuItem1) {
var jsonObj = $midmenuItem1.data("jsonObj");
var id = jsonObj.id;
var apiCommand = "command=startVirtualMachine&id="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");
@ -1112,7 +1112,7 @@ function doStopVM($actionLink, $detailsTab, $midmenuItem1) {
var jsonObj = $midmenuItem1.data("jsonObj");
var id = jsonObj.id;
var apiCommand = "command=stopVirtualMachine&id="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");
@ -1130,7 +1130,7 @@ function doRebootVM($actionLink, $detailsTab, $midmenuItem1) {
var jsonObj = $midmenuItem1.data("jsonObj");
var id = jsonObj.id;
var apiCommand = "command=rebootVirtualMachine&id="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");
@ -1148,7 +1148,7 @@ function doDestroyVM($actionLink, $detailsTab, $midmenuItem1) {
var jsonObj = $midmenuItem1.data("jsonObj");
var id = jsonObj.id;
var apiCommand = "command=destroyVirtualMachine&id="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");
@ -1166,7 +1166,7 @@ function doRestoreVM($actionLink, $detailsTab, $midmenuItem1) {
var jsonObj = $midmenuItem1.data("jsonObj");
var id = jsonObj.id;
var apiCommand = "command=recoverVirtualMachine&id="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");
@ -1275,7 +1275,7 @@ function doAttachISO($actionLink, $detailsTab, $midmenuItem1) {
var jsonObj = $midmenuItem1.data("jsonObj");
var id = jsonObj.id;
var apiCommand = "command=attachIso&virtualmachineid="+id+"&id="+isoId;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");
@ -1292,7 +1292,7 @@ function doDetachISO($actionLink, $detailsTab, $midmenuItem1) {
var jsonObj = $midmenuItem1.data("jsonObj");
var id = jsonObj.id;
var apiCommand = "command=detachIso&virtualmachineid="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");
@ -1316,7 +1316,7 @@ function doResetPassword($actionLink, $detailsTab, $midmenuItem1) {
var id = jsonObj.id;
var apiCommand = "command=resetPasswordForVirtualMachine&id="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"No": function() {
$(this).dialog("close");
@ -1363,7 +1363,7 @@ function doChangeService($actionLink, $detailsTab, $midmenuItem1) {
$midmenuItem1.data("afterActionInfo", ($actionLink.data("label") + " action failed. Reason: virtual instance needs to be stopped before you can change its service."));
}
var apiCommand = "command=changeServiceForVirtualMachine&id="+id+"&serviceOfferingId="+serviceOfferingId;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");
@ -1451,42 +1451,42 @@ function vmJsonToDetailsTab(){
var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu");
$actionMenu.find("#action_list").empty();
buildActionLinkForDetailsTab("Edit Instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Edit Instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
// Show State of the VM
if (jsonObj.state == 'Destroyed') {
buildActionLinkForDetailsTab("Restore Instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Restore Instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
//to hide view console in details tab....(to-do)
//to hide volume tab....(to-do)
}
else if (jsonObj.state == 'Running') {
//instanceTemplate.find("#vm_action_start, #vm_action_reset_password, #vm_action_change_service").removeClass().addClass("vmaction_links_off");
buildActionLinkForDetailsTab("Stop Instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForDetailsTab("Reboot Instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForDetailsTab("Destroy Instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Stop Instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Reboot Instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Destroy Instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
if (jsonObj.isoid == null)
buildActionLinkForDetailsTab("Attach ISO", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Attach ISO", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
else
buildActionLinkForDetailsTab("Detach ISO", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Detach ISO", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
}
else {
if (jsonObj.state == 'Stopped') {
//instanceTemplate.find("#vm_action_stop, #vm_action_reboot").removeClass().addClass("vmaction_links_off");
buildActionLinkForDetailsTab("Start Instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForDetailsTab("Destroy Instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Start Instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Destroy Instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
if (jsonObj.isoid == null)
buildActionLinkForDetailsTab("Attach ISO", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Attach ISO", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
else
buildActionLinkForDetailsTab("Detach ISO", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Detach ISO", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForDetailsTab("Reset Password", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForDetailsTab("Change Service", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Reset Password", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Change Service", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
}
else { //jsonObj.state == "Starting", "Creating", ~~~
if(jsonObj.state != 'Creating')
buildActionLinkForDetailsTab("Destroy Instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Destroy Instance", vmActionMap, $actionMenu, $midmenuItem1, $thisTab);
//instanceTemplate.find("#vm_action_start, #vm_action_stop, #vm_action_reboot, #vm_action_attach_iso, #vm_action_detach_iso, #vm_action_reset_password, #vm_action_change_service").removeClass().addClass("vmaction_links_off");
}

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

@ -265,9 +265,9 @@ function isoJsonToDetailsTab() {
//$("#edit_button").hide();
}
else {
buildActionLinkForDetailsTab("Edit ISO", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Edit ISO", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);
//$("#edit_button").show();
buildActionLinkForDetailsTab("Copy ISO", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Copy ISO", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);
noAvailableActions = false;
}
@ -275,7 +275,7 @@ function isoJsonToDetailsTab() {
if (((isUser() && jsonObj.ispublic == "true" && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account)) || jsonObj.isready == "false") || (jsonObj.bootable == "false")) {
}
else {
buildActionLinkForDetailsTab("Create VM", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Create VM", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);
noAvailableActions = false;
}
@ -283,7 +283,7 @@ function isoJsonToDetailsTab() {
if (((isUser() && jsonObj.ispublic == "true" && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account))) || (jsonObj.isready == "false" && jsonObj.isostatus != null && jsonObj.isostatus.indexOf("% Downloaded") != -1)) {
}
else {
buildActionLinkForDetailsTab("Delete ISO", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Delete ISO", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);
noAvailableActions = false;
}
@ -449,7 +449,7 @@ function doDeleteIso($actionLink, $detailsTab, $midmenuItem1) {
"Confirm": function() {
$(this).dialog("close");
var apiCommand = "command=deleteIso&id="+id+moreCriteria.join("");
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");
@ -487,7 +487,7 @@ function doCopyIso($actionLink, $detailsTab, $midmenuItem1) {
var destZoneId = thisDialog.find("#copy_iso_zone").val();
var apiCommand = "command=copyIso&id="+id+"&sourcezoneid="+sourceZoneId+"&destzoneid="+destZoneId;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");
@ -528,7 +528,7 @@ function doCreateVMFromIso($actionLink, $detailsTab, $midmenuItem1) {
array1.push("&hypervisor="+hypervisor);
var apiCommand = "command=deployVirtualMachine&zoneId="+zoneId+"&templateId="+id+array1.join("");
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");

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

@ -16,8 +16,8 @@
*
*/
//***** actions for details tab in right panel (begin) ************************************************************************
function buildActionLinkForDetailsTab(label, actionMap, $actionMenu, $midmenuItem1, $thisTab) {
//***** actions for a tab in right panel (begin) ************************************************************************
function buildActionLinkForTab(label, actionMap, $actionMenu, $midmenuItem1, $thisTab) {
var apiInfo = actionMap[label];
var $listItem = $("#action_list_item").clone();
$actionMenu.find("#action_list").append($listItem.show());
@ -34,7 +34,7 @@ function buildActionLinkForDetailsTab(label, actionMap, $actionMenu, $midmenuIte
var dialogBeforeActionFn = apiInfo.dialogBeforeActionFn;
if(dialogBeforeActionFn == null) {
var apiCommand = "command="+apiInfo.api+"&id="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $thisTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $thisTab);
}
else {
dialogBeforeActionFn($actionLink, $thisTab, $midmenuItem1);
@ -43,7 +43,7 @@ function buildActionLinkForDetailsTab(label, actionMap, $actionMenu, $midmenuIte
});
}
function doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $thisTab) {
function doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $thisTab) {
var label = $actionLink.data("label");
var apiInfo = $actionLink.data("apiInfo");
@ -172,7 +172,7 @@ function handleMidMenuItemAfterDetailsTabAction($midmenuItem1, isSuccessful, aft
$infoIcon.addClass("error");
}
//***** actions for details tab in right panel (end) **************************************************************************
//***** actions for a tab in right panel (end) **************************************************************************
//***** actions for a subgrid item in right panel (begin) ************************************************************************
function buildActionLinkForSubgridItem(label, actionMap, $actionMenu, $subgridItem) {

4
ui/scripts/cloud.core.pod.js
View File

@ -69,8 +69,8 @@ function podJsonToDetailsTab($leftmenuItem1) {
});
var $actionMenu = $detailsTab.find("#action_link #action_menu");
$actionMenu.find("#action_list").empty();
buildActionLinkForDetailsTab("Edit Pod", podActionMap, $actionMenu, $leftmenuItem1, $detailsTab);
buildActionLinkForDetailsTab("Delete Pod", podActionMap, $actionMenu, $leftmenuItem1, $detailsTab);
buildActionLinkForTab("Edit Pod", podActionMap, $actionMenu, $leftmenuItem1, $detailsTab);
buildActionLinkForTab("Delete Pod", podActionMap, $actionMenu, $leftmenuItem1, $detailsTab);
}
function podJsonClearRightPanel(jsonObj) {

12
ui/scripts/cloud.core.primarystorage.js
View File

@ -79,9 +79,9 @@ function primarystorageJsonToDetailsTab($midmenuItem1) {
});
var $actionMenu = $detailsTab.find("#action_link #action_menu");
$actionMenu.find("#action_list").empty();
buildActionLinkForDetailsTab("Enable Maintenance Mode", primarystorageActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForDetailsTab("Cancel Maintenance Mode", primarystorageActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForDetailsTab("Delete Primary Storage", primarystorageActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Enable Maintenance Mode", primarystorageActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Cancel Maintenance Mode", primarystorageActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Delete Primary Storage", primarystorageActionMap, $actionMenu, $midmenuItem1, $detailsTab);
}
function primarystorageClearRigntPanel() {
@ -150,7 +150,7 @@ function doEnableMaintenanceModeForPrimaryStorage($actionLink, $detailsTab, $mid
$(this).dialog("close");
var id = jsonObj.id;
var apiCommand = "command=enableStorageMaintenance&id="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");
@ -168,7 +168,7 @@ function doCancelMaintenanceModeForPrimaryStorage($actionLink, $detailsTab, $mid
$(this).dialog("close");
var id = jsonObj.id;
var apiCommand = "command=cancelStorageMaintenance&id="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");
@ -185,7 +185,7 @@ function doDeletePrimaryStorage($actionLink, $detailsTab, $midmenuItem1){
$(this).dialog("close");
var id = jsonObj.id;
var apiCommand = "command=deleteStoragePool&id="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");

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

@ -64,12 +64,12 @@ function routerJsonToDetailsTab($midmenuItem1) {
var noAvailableActions = true;
if (jsonObj.state == 'Running') {
buildActionLinkForDetailsTab("Stop Router", routerActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForDetailsTab("Reboot Router", routerActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Stop Router", routerActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Reboot Router", routerActionMap, $actionMenu, $midmenuItem1, $detailsTab);
noAvailableActions = false;
}
else if (jsonObj.state == 'Stopped') {
buildActionLinkForDetailsTab("Start Router", routerActionMap, $actionMenu, $midmenuItem1, $detailsTab);
buildActionLinkForTab("Start Router", routerActionMap, $actionMenu, $midmenuItem1, $detailsTab);
noAvailableActions = false;
}

4
ui/scripts/cloud.core.serviceoffering.js
View File

@ -227,8 +227,8 @@ function serviceOfferingJsonToDetailsTab() {
//actions ***
var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu");
$actionMenu.find("#action_list").empty();
buildActionLinkForDetailsTab("Edit Service Offering", serviceOfferingActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForDetailsTab("Delete Service Offering", serviceOfferingActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Edit Service Offering", serviceOfferingActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Delete Service Offering", serviceOfferingActionMap, $actionMenu, $midmenuItem1, $thisTab);
$thisTab.find("#tab_spinning_wheel").hide();
$thisTab.find("#tab_container").show();

10
ui/scripts/cloud.core.snapshot.js
View File

@ -88,9 +88,9 @@ function snapshotJsonToDetailsTab() {
//actions ***
var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu");
$actionMenu.find("#action_list").empty();
buildActionLinkForDetailsTab("Create Volume" , snapshotActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForDetailsTab("Delete Snapshot", snapshotActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForDetailsTab("Create Template", snapshotActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Create Volume" , snapshotActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Delete Snapshot", snapshotActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Create Template", snapshotActionMap, $actionMenu, $midmenuItem1, $thisTab);
$thisTab.find("#tab_spinning_wheel").hide();
$thisTab.find("#tab_container").show();
@ -159,7 +159,7 @@ function doCreateVolumeFromSnapshotInSnapshotPage($actionLink, $detailsTab, $mid
var id = jsonObj.id;
var apiCommand = "command=createVolume&snapshotid="+id+"&name="+name;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");
@ -188,7 +188,7 @@ function doCreateTemplateFromSnapshotInSnapshotPage($actionLink, $detailsTab, $m
var id = jsonObj.id;
var apiCommand = "command=createTemplate&snapshotid="+id+"&name="+name+"&displaytext="+displayText+"&ostypeid="+osTypeId+"&passwordEnabled="+password;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");

12
ui/scripts/cloud.core.systemvm.js
View File

@ -65,11 +65,11 @@ function systemvmJsonToDetailsTab($leftmenuItem1) {
$actionMenu.find("#action_list").empty();
if (jsonObj.state == 'Running') { //Show "Stop System VM", "Reboot System VM"
buildActionLinkForDetailsTab("Stop System VM", systemVmActionMap, $actionMenu, $leftmenuItem1, $detailsTab);
buildActionLinkForDetailsTab("Reboot System VM", systemVmActionMap, $actionMenu, $leftmenuItem1, $detailsTab);
buildActionLinkForTab("Stop System VM", systemVmActionMap, $actionMenu, $leftmenuItem1, $detailsTab);
buildActionLinkForTab("Reboot System VM", systemVmActionMap, $actionMenu, $leftmenuItem1, $detailsTab);
}
else if (jsonObj.state == 'Stopped') { //show "Start System VM"
buildActionLinkForDetailsTab("Start System VM", systemVmActionMap, $actionMenu, $leftmenuItem1, $detailsTab);
buildActionLinkForTab("Start System VM", systemVmActionMap, $actionMenu, $leftmenuItem1, $detailsTab);
}
}
@ -155,7 +155,7 @@ function doStartSystemVM($actionLink, $detailsTab, $midmenuItem1) {
var jsonObj = $midmenuItem1.data("jsonObj");
var id = jsonObj.id;
var apiCommand = "command=startSystemVm&id="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");
@ -173,7 +173,7 @@ function doStopSystemVM($actionLink, $detailsTab, $midmenuItem1) {
var jsonObj = $midmenuItem1.data("jsonObj");
var id = jsonObj.id;
var apiCommand = "command=stopSystemVm&id="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");
@ -191,7 +191,7 @@ function doRebootSystemVM($actionLink, $detailsTab, $midmenuItem1) {
var jsonObj = $midmenuItem1.data("jsonObj");
var id = jsonObj.id;
var apiCommand = "command=rebootSystemVm&id="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");

14
ui/scripts/cloud.core.template.js
View File

@ -287,10 +287,10 @@ function templateJsonToDetailsTab() {
//$("#edit_button").hide();
}
else {
buildActionLinkForDetailsTab("Edit Template", templateActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Edit Template", templateActionMap, $actionMenu, $midmenuItem1, $thisTab);
//$("#edit_button").show();
buildActionLinkForDetailsTab("Copy Template", templateActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForDetailsTab("Create VM", templateActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Copy Template", templateActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Create VM", templateActionMap, $actionMenu, $midmenuItem1, $thisTab);
noAvailableActions = false;
}
@ -299,7 +299,7 @@ function templateJsonToDetailsTab() {
//template.find("#template_delete_container").hide();
}
else {
buildActionLinkForDetailsTab("Delete Template", templateActionMap, $actionMenu, $midmenuItem1, $thisTab);
buildActionLinkForTab("Delete Template", templateActionMap, $actionMenu, $midmenuItem1, $thisTab);
noAvailableActions = false;
}
@ -524,7 +524,7 @@ function doDeleteTemplate($actionLink, $detailsTab, $midmenuItem1) {
"Confirm": function() {
$(this).dialog("close");
var apiCommand = "command=deleteTemplate&id="+id+moreCriteria.join("");
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");
@ -569,7 +569,7 @@ function doCopyTemplate($actionLink, $detailsTab, $midmenuItem1) {
var id = $detailsTab.data("jsonObj").id;
var apiCommand = "command=copyTemplate&id="+id+"&sourcezoneid="+sourceZoneId+"&destzoneid="+destZoneId;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");
@ -613,7 +613,7 @@ function doCreateVMFromTemplate($actionLink, $detailsTab, $midmenuItem1) {
array1.push("&diskOfferingId="+diskOfferingId);
var apiCommand = "command=deployVirtualMachine&zoneId="+zoneId+"&templateId="+id+array1.join("");
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");

18
ui/scripts/cloud.core.volume.js
View File

@ -417,27 +417,27 @@ function volumeJsonToDetailsTab(){
var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu");
$actionMenu.find("#action_list").empty();
buildActionLinkForDetailsTab("Take Snapshot", volumeActionMap, $actionMenu, $midmenuItem1, $thisTab); //show take snapshot
buildActionLinkForDetailsTab("Recurring Snapshot", volumeActionMap, $actionMenu, $midmenuItem1, $thisTab); //show Recurring Snapshot
buildActionLinkForTab("Take Snapshot", volumeActionMap, $actionMenu, $midmenuItem1, $thisTab); //show take snapshot
buildActionLinkForTab("Recurring Snapshot", volumeActionMap, $actionMenu, $midmenuItem1, $thisTab); //show Recurring Snapshot
if(jsonObj.state != "Creating" && jsonObj.state != "Corrupted" && jsonObj.name != "attaching") {
if(jsonObj.type=="ROOT") {
if (jsonObj.vmstate == "Stopped") {
//buildActionLinkForDetailsTab("Create Template", volumeActionMap, $actionMenu, $midmenuItem1, $thisTab); //backend of CreateTemplateFromVolume is not working. Hide the option from UI until backend is fixed.
//buildActionLinkForTab("Create Template", volumeActionMap, $actionMenu, $midmenuItem1, $thisTab); //backend of CreateTemplateFromVolume is not working. Hide the option from UI until backend is fixed.
}
}
else {
if (jsonObj.virtualmachineid != null) {
if (jsonObj.storagetype == "shared" && (jsonObj.vmstate == "Running" || jsonObj.vmstate == "Stopped")) {
buildActionLinkForDetailsTab("Detach Disk", volumeActionMap, $actionMenu, $midmenuItem1, $thisTab); //show detach disk
buildActionLinkForTab("Detach Disk", volumeActionMap, $actionMenu, $midmenuItem1, $thisTab); //show detach disk
}
} else {
// Disk not attached
if (jsonObj.storagetype == "shared") {
buildActionLinkForDetailsTab("Attach Disk", volumeActionMap, $actionMenu, $midmenuItem1, $thisTab); //show attach disk
buildActionLinkForTab("Attach Disk", volumeActionMap, $actionMenu, $midmenuItem1, $thisTab); //show attach disk
if(jsonObj.vmname == null || jsonObj.vmname == "none")
buildActionLinkForDetailsTab("Delete Volume", volumeActionMap, $actionMenu, $midmenuItem1, $thisTab); //show delete volume
buildActionLinkForTab("Delete Volume", volumeActionMap, $actionMenu, $midmenuItem1, $thisTab); //show delete volume
}
}
}
@ -617,7 +617,7 @@ function doCreateTemplateFromVolume($actionLink, $detailsTab, $midmenuItem1) {
var id = $detailsTab.data("jsonObj").id;
var apiCommand = "command=createTemplate&volumeId="+id+"&name="+todb(name)+"&displayText="+todb(desc)+"&osTypeId="+osType+"&isPublic="+isPublic+"&passwordEnabled="+password;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");
@ -633,7 +633,7 @@ function doTakeSnapshot($actionLink, $detailsTab, $midmenuItem1) {
var id = $detailsTab.data("jsonObj").id;
var apiCommand = "command=createSnapshot&volumeid="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");
@ -857,7 +857,7 @@ function doAttachDisk($actionLink, $detailsTab, $midmenuItem1) {
var id = jsonObj.id;
var apiCommand = "command=attachVolume&id="+id+'&virtualMachineId='+virtualMachineId;
doActionToDetailsTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
doActionToTab(id, $actionLink, apiCommand, $midmenuItem1, $detailsTab);
},
"Cancel": function() {
$(this).dialog("close");

4
ui/scripts/cloud.core.zone.js
View File

@ -130,8 +130,8 @@ function zoneJsonToDetailsTab($leftmenuItem1) {
});
var $actionMenu = $detailsTab.find("#action_link #action_menu");
$actionMenu.find("#action_list").empty();
buildActionLinkForDetailsTab("Edit Zone", zoneActionMap, $actionMenu, $leftmenuItem1, $detailsTab);
buildActionLinkForDetailsTab("Delete Zone", zoneActionMap, $actionMenu, $leftmenuItem1, $detailsTab);
buildActionLinkForTab("Edit Zone", zoneActionMap, $actionMenu, $leftmenuItem1, $detailsTab);
buildActionLinkForTab("Delete Zone", zoneActionMap, $actionMenu, $leftmenuItem1, $detailsTab);
}
function zoneJsonClearDetailsTab(jsonObj) {