From 6901b8a1eef329562ac63b925a3adf23c1679aaf Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 3 Apr 2014 13:45:34 -0700 Subject: [PATCH] CLOUDSTACK-6335: UI - Acquire IP dialog - show/hide "cross zones" checkbox upon portableipserviceenabled property of the current region instead of Local region. --- ui/scripts/network.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index f82a295aee7..76bf26dc18a 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -2131,12 +2131,15 @@ $.ajax({ url: createURL('listRegions'), success: function(json) { + var selectedRegionName = $(".region-switcher .title").text(); + if ( selectedRegionName == undefined || selectedRegionName.length == 0) { + selectedRegionName = "Local"; + } var items = json.listregionsresponse.region; if(items != null) { - for(var i = 0; i < items.length; i++) { - var region = items[0]; - if(region.name == 'Local') { - if(region.portableipserviceenabled == true) { + for(var i = 0; i < items.length; i++) { + if(items[i].name == selectedRegionName) { + if(items[i].portableipserviceenabled == true) { args.$form.find('.form-item[rel=isportable]').css('display', 'inline-block'); } else { args.$form.find('.form-item[rel=isportable]').hide();