diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js index 868c9049093..84a9bcde488 100644 --- a/ui/new/scripts/cloud.core2.instance.js +++ b/ui/new/scripts/cloud.core2.instance.js @@ -1607,11 +1607,11 @@ function vmJsonToDetailsTab($midmenuItem1){ $detailsTab.find("#group").text(fromdb(jsonObj.group)); $detailsTab.find("#group_edit").val(fromdb(jsonObj.group)); - setBooleanField(jsonObj.haenable, $detailsTab.find("#haenable")); - setBooleanDropdownField(jsonObj.haenable, $detailsTab.find("#haenable_edit")); + setBooleanReadField(jsonObj.haenable, $detailsTab.find("#haenable")); + setBooleanEditField(jsonObj.haenable, $detailsTab.find("#haenable_edit")); //$detailsTab.find("#haenable_edit").val(jsonObj.haenable); - setBooleanField((jsonObj.isoid != null), $detailsTab.find("#iso")); + setBooleanReadField((jsonObj.isoid != null), $detailsTab.find("#iso")); //actions *** var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu"); diff --git a/ui/new/scripts/cloud.core2.iso.js b/ui/new/scripts/cloud.core2.iso.js index 800306c521f..5d9f68fa4b9 100644 --- a/ui/new/scripts/cloud.core2.iso.js +++ b/ui/new/scripts/cloud.core2.iso.js @@ -199,8 +199,8 @@ function isoJsonToDetailsTab($midmenuItem1) { else $detailsTab.find("#size").text(""); - setBooleanField(jsonObj.bootable, $detailsTab.find("#bootable")); - setBooleanField(jsonObj.crossZones, $detailsTab.find("#crossZones")); + setBooleanReadField(jsonObj.bootable, $detailsTab.find("#bootable")); + setBooleanReadField(jsonObj.crossZones, $detailsTab.find("#crossZones")); setDateField(jsonObj.created, $detailsTab.find("#created")); diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js index 52f03bbf32b..b0ad70cc77d 100644 --- a/ui/new/scripts/cloud.core2.js +++ b/ui/new/scripts/cloud.core2.js @@ -540,7 +540,7 @@ function todb(val) { var midmenuItemCount = 20; -function setBooleanField(value, $field) { +function setBooleanReadField(value, $field) { if(value == "true" || value == true) $field.text("Yes").show(); else if(value == "false" || value == false) @@ -549,7 +549,7 @@ function setBooleanField(value, $field) { $field.hide(); } -function setBooleanDropdownField(value, $field) { +function setBooleanEditField(value, $field) { if(value == "true" || value == true) $field.val("true"); else if(value == "false" || value == false) diff --git a/ui/new/scripts/cloud.core2.serviceoffering.js b/ui/new/scripts/cloud.core2.serviceoffering.js index ba14451e5eb..6da0066c78a 100644 --- a/ui/new/scripts/cloud.core2.serviceoffering.js +++ b/ui/new/scripts/cloud.core2.serviceoffering.js @@ -178,7 +178,7 @@ function serviceOfferingJsonToDetailsTab($midmenuItem1) { $detailsTab.find("#cpu").text(jsonObj.cpunumber + " x " + convertHz(jsonObj.cpuspeed)); $detailsTab.find("#memory").text(convertBytes(parseInt(jsonObj.memory)*1024*1024)); - setBooleanField(jsonObj.offerha, $detailsTab.find("#offerha")); + setBooleanReadField(jsonObj.offerha, $detailsTab.find("#offerha")); $detailsTab.find("#offerha_edit").val(jsonObj.offerha); $detailsTab.find("#networktype").text(toNetworkType(jsonObj.usevirtualnetwork)); diff --git a/ui/new/scripts/cloud.core2.template.js b/ui/new/scripts/cloud.core2.template.js index 61632d81364..4d66c810c0b 100644 --- a/ui/new/scripts/cloud.core2.template.js +++ b/ui/new/scripts/cloud.core2.template.js @@ -235,16 +235,16 @@ function templateJsonToDetailsTab($midmenuItem1) { else $detailsTab.find("#size").text(""); - setBooleanField(jsonObj.passwordenabled, $detailsTab.find("#passwordenabled")); + setBooleanReadField(jsonObj.passwordenabled, $detailsTab.find("#passwordenabled")); $detailsTab.find("#passwordenabled_edit").val(jsonObj.passwordenabled); - setBooleanField(jsonObj.ispublic, $detailsTab.find("#ispublic")); + setBooleanReadField(jsonObj.ispublic, $detailsTab.find("#ispublic")); $detailsTab.find("#ispublic_edit").val(jsonObj.ispublic); - setBooleanField(jsonObj.isfeatured, $detailsTab.find("#isfeatured")); + setBooleanReadField(jsonObj.isfeatured, $detailsTab.find("#isfeatured")); $detailsTab.find("#isfeatured_edit").val(jsonObj.isfeatured); - setBooleanField(jsonObj.crossZones, $detailsTab.find("#crossZones")); + setBooleanReadField(jsonObj.crossZones, $detailsTab.find("#crossZones")); $detailsTab.find("#ostypename").text(fromdb(jsonObj.ostypename)); $detailsTab.find("#ostypename_edit").val(jsonObj.ostypeid);