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

bug 7608: account/diskOffering/domain/ISO/networkOffering/serviceOffering/template page- cancel edit mode when clicking on different tab or different middle menu item.

Browse Source
This commit is contained in:
Jessica Wang 2011-01-19 12:42:35 -08:00
parent e6fc91c8b6
commit 23e27370b4
7 changed files with 62 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,7 +61,10 @@ function afterLoadAccountJSP() {
var tabContentArray = [$("#tab_content_details"), $("#tab_content_user")];
var afterSwitchFnArray = [accountJsonToDetailsTab, accountJsonToUserTab];
switchBetweenDifferentTabs(tabArray, tabContentArray, afterSwitchFnArray);
$readonlyFields = $("#tab_content_details").find("#name");
$editFields = $("#tab_content_details").find("#name_edit");
initTimezonesObj();
}
@ -581,18 +584,13 @@ var accountActionMap = {
}
};
function doEditAccount($actionLink, $detailsTab, $midmenuItem1) {
var $readonlyFields = $detailsTab.find("#name");
var $editFields = $detailsTab.find("#name_edit");
function doEditAccount($actionLink, $detailsTab, $midmenuItem1) {
$readonlyFields.hide();
$editFields.show();
$detailsTab.find("#cancel_button, #save_button").show();
$detailsTab.find("#cancel_button").unbind("click").bind("click", function(event){
$editFields.hide();
$readonlyFields.show();
$("#save_button, #cancel_button").hide();
cancelEditMode($detailsTab);
return false;
});
$detailsTab.find("#save_button").unbind("click").bind("click", function(event){

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

@ -37,7 +37,10 @@ function diskOfferingGetSearchParams() {
}
function afterLoadDiskOfferingJSP() {
initAddDiskOfferingDialog();
initAddDiskOfferingDialog();
$readonlyFields = $("#tab_content_details").find("#name, #displaytext, #tags, #domain");
$editFields = $("#tab_content_details").find("#name_edit, #displaytext_edit, #domain_edit");
}
function initAddDiskOfferingDialog() {
@ -158,17 +161,12 @@ function initAddDiskOfferingDialog() {
}
function doEditDiskOffering($actionLink, $detailsTab, $midmenuItem1) {
var $readonlyFields = $detailsTab.find("#name, #displaytext, #tags, #domain");
var $editFields = $detailsTab.find("#name_edit, #displaytext_edit, #domain_edit");
$readonlyFields.hide();
$editFields.show();
$detailsTab.find("#cancel_button, #save_button").show();
$detailsTab.find("#cancel_button").unbind("click").bind("click", function(event){
$editFields.hide();
$readonlyFields.show();
$("#save_button, #cancel_button").hide();
cancelEditMode($detailsTab);
return false;
});
$detailsTab.find("#save_button").unbind("click").bind("click", function(event){

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

@ -120,6 +120,9 @@ function afterLoadDomainJSP() {
var tabContentArray = [$("#tab_content_details"), $("#tab_content_admin_account"), $("#tab_content_resource_limits")];
var afterSwitchFnArray = [domainJsonToDetailsTab, domainJsonToAdminAccountTab ,domainJsonToResourceLimitsTab ];
switchBetweenDifferentTabs(tabArray, tabContentArray, afterSwitchFnArray);
$readonlyFields = $("#tab_content_details").find("#name");
$editFields = $("#tab_content_details").find("#name_edit");
}
function initAddDomainDialog() {
@ -209,7 +212,8 @@ function domainToRightPanel($midmenuItem1) {
}
function domainToRightPanel2($midmenuItem1) {
$("#right_panel_content").data("$midmenuItem1", $midmenuItem1);
$("#right_panel_content").data("$midmenuItem1", $midmenuItem1);
cancelEditMode($("#tab_content_details"));
$("#tab_details").click();
}
@ -565,17 +569,12 @@ function doEditResourceLimits2($actionLink, $detailsTab, $midmenuItem1, $readonl
function doEditDomain($actionLink, $detailsTab, $midmenuItem1) {
var $readonlyFields = $detailsTab.find("#name");
var $editFields = $detailsTab.find("#name_edit");
$readonlyFields.hide();
$editFields.show();
$detailsTab.find("#cancel_button, #save_button").show();
$detailsTab.find("#cancel_button").unbind("click").bind("click", function(event){
$editFields.hide();
$readonlyFields.show();
$("#save_button, #cancel_button").hide();
cancelEditMode($detailsTab);
return false;
});
$detailsTab.find("#save_button").unbind("click").bind("click", function(event){

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

@ -60,6 +60,21 @@ function afterLoadIsoJSP() {
initAddIsoDialog();
initCreateVmFromIsoDialog();
var $detailsTab = $("#tab_content_details");
if(isAdmin()) {
$readonlyFields = $detailsTab.find("#name, #displaytext, #ispublic, #ostypename, #isfeatured");
$editFields = $detailsTab.find("#name_edit, #displaytext_edit, #ispublic_edit, #ostypename_edit, #isfeatured_edit");
}
else {
if (g_userPublicTemplateEnabled == "true") {
$readonlyFields = $detailsTab.find("#name, #displaytext, #ispublic, #ostypename");
$editFields = $detailsTab.find("#name_edit, #displaytext_edit, #ispublic_edit, #ostypename_edit");
} else {
$readonlyFields = $detailsTab.find("#name, #displaytext, #ostypename");
$editFields = $detailsTab.find("#name_edit, #displaytext_edit, #ostypename_edit");
}
}
}
function initAddIsoDialog() {
@ -444,31 +459,13 @@ var isoActionMap = {
}
}
function doEditISO($actionLink, $detailsTab, $midmenuItem1) {
var $readonlyFields, $editFields;
if(isAdmin()) {
$readonlyFields = $detailsTab.find("#name, #displaytext, #ispublic, #ostypename, #isfeatured");
$editFields = $detailsTab.find("#name_edit, #displaytext_edit, #ispublic_edit, #ostypename_edit, #isfeatured_edit");
}
else {
if (g_userPublicTemplateEnabled == "true") {
$readonlyFields = $detailsTab.find("#name, #displaytext, #ispublic, #ostypename");
$editFields = $detailsTab.find("#name_edit, #displaytext_edit, #ispublic_edit, #ostypename_edit");
} else {
$readonlyFields = $detailsTab.find("#name, #displaytext, #ostypename");
$editFields = $detailsTab.find("#name_edit, #displaytext_edit, #ostypename_edit");
}
}
function doEditISO($actionLink, $detailsTab, $midmenuItem1) {
$readonlyFields.hide();
$editFields.show();
$detailsTab.find("#cancel_button, #save_button").show();
$detailsTab.find("#cancel_button").unbind("click").bind("click", function(event){
$editFields.hide();
$readonlyFields.show();
$("#save_button, #cancel_button").hide();
cancelEditMode($detailsTab);
return false;
});
$detailsTab.find("#save_button").unbind("click").bind("click", function(event){

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

@ -40,21 +40,17 @@ function networkOfferingGetSearchParams() {
}
function afterLoadNetworkOfferingJSP() {
$readonlyFields = $("#tab_content_details").find("#name, #displaytext, #availability");
$editFields = $("#tab_content_details").find("#name_edit, #displaytext_edit, #availability_edit");
}
function doEditNetworkOffering($actionLink, $detailsTab, $midmenuItem1) {
var $readonlyFields = $detailsTab.find("#name, #displaytext, #availability");
var $editFields = $detailsTab.find("#name_edit, #displaytext_edit, #availability_edit");
$readonlyFields.hide();
$editFields.show();
$detailsTab.find("#cancel_button, #save_button").show();
$detailsTab.find("#cancel_button").unbind("click").bind("click", function(event){
$editFields.hide();
$readonlyFields.show();
$("#save_button, #cancel_button").hide();
cancelEditMode($detailsTab);
return false;
});
$detailsTab.find("#save_button").unbind("click").bind("click", function(event){

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

@ -37,7 +37,10 @@ function serviceOfferingGetSearchParams() {
}
function afterLoadServiceOfferingJSP() {
initAddServiceOfferingDialog();
initAddServiceOfferingDialog();
$readonlyFields = $("#tab_content_details").find("#name, #displaytext, #offerha, #tags, #domain");
$editFields = $("#tab_content_details").find("#name_edit, #displaytext_edit, #offerha_edit, #domain_edit");
}
function initAddServiceOfferingDialog() {
@ -157,17 +160,12 @@ function initAddServiceOfferingDialog() {
}
function doEditServiceOffering($actionLink, $detailsTab, $midmenuItem1) {
var $readonlyFields = $detailsTab.find("#name, #displaytext, #offerha, #tags, #domain");
var $editFields = $detailsTab.find("#name_edit, #displaytext_edit, #offerha_edit, #domain_edit");
$readonlyFields.hide();
$editFields.show();
$detailsTab.find("#cancel_button, #save_button").show();
$detailsTab.find("#cancel_button").unbind("click").bind("click", function(event){
$editFields.hide();
$readonlyFields.show();
$("#save_button, #cancel_button").hide();
cancelEditMode($detailsTab);
return false;
});
$detailsTab.find("#save_button").unbind("click").bind("click", function(event){

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

@ -83,11 +83,24 @@ function afterLoadTemplateJSP() {
return false;
});
if(isAdmin())
$("#dialog_add_template #add_template_featured_container, #dialog_edit_template #edit_template_featured_container").show();
else
$("#dialog_add_template #add_template_featured_container, #dialog_edit_template #edit_template_featured_container").hide();
if(isAdmin()) {
$readonlyFields = $detailsTab.find("#name, #displaytext, #passwordenabled, #ispublic, #isfeatured, #ostypename");
$editFields = $detailsTab.find("#name_edit, #displaytext_edit, #passwordenabled_edit, #ispublic_edit, #isfeatured_edit, #ostypename_edit");
$("#dialog_add_template #add_template_featured_container, #dialog_edit_template #edit_template_featured_container").show();
}
else {
if (g_userPublicTemplateEnabled == "true") {
$readonlyFields = $detailsTab.find("#name, #displaytext, #passwordenabled, #ispublic, #ostypename");
$editFields = $detailsTab.find("#name_edit, #displaytext_edit, #passwordenabled_edit, #ispublic_edit, #ostypename_edit");
} else {
$readonlyFields = $detailsTab.find("#name, #displaytext, #passwordenabled, #ostypename");
$editFields = $detailsTab.find("#name_edit, #displaytext_edit, #passwordenabled_edit, #ostypename_edit");
}
$("#dialog_add_template #add_template_featured_container, #dialog_edit_template #edit_template_featured_container").hide();
}
//add button ***
$("#add_template_button").unbind("click").bind("click", function(event) {
$("#dialog_add_template #add_template_hypervisor").change();
@ -470,31 +483,13 @@ var templateActionMap = {
}
}
function doEditTemplate($actionLink, $detailsTab, $midmenuItem1) {
var $readonlyFields, $editFields;
if(isAdmin()) {
$readonlyFields = $detailsTab.find("#name, #displaytext, #passwordenabled, #ispublic, #isfeatured, #ostypename");
$editFields = $detailsTab.find("#name_edit, #displaytext_edit, #passwordenabled_edit, #ispublic_edit, #isfeatured_edit, #ostypename_edit");
}
else {
if (g_userPublicTemplateEnabled == "true") {
$readonlyFields = $detailsTab.find("#name, #displaytext, #passwordenabled, #ispublic, #ostypename");
$editFields = $detailsTab.find("#name_edit, #displaytext_edit, #passwordenabled_edit, #ispublic_edit, #ostypename_edit");
} else {
$readonlyFields = $detailsTab.find("#name, #displaytext, #passwordenabled, #ostypename");
$editFields = $detailsTab.find("#name_edit, #displaytext_edit, #passwordenabled_edit, #ostypename_edit");
}
}
function doEditTemplate($actionLink, $detailsTab, $midmenuItem1) {
$readonlyFields.hide();
$editFields.show();
$detailsTab.find("#cancel_button, #save_button").show();
$detailsTab.find("#cancel_button").unbind("click").bind("click", function(event){
$editFields.hide();
$readonlyFields.show();
$("#save_button, #cancel_button").hide();
cancelEditMode($detailsTab);
return false;
});
$detailsTab.find("#save_button").unbind("click").bind("click", function(event){