Updated Branches: refs/heads/master c0d39ebbf -> e11355602
CLOUDSTACK-543: cloudstack UI - create network offering dialog - disable Redundant router capability checkbox, Conserve Mode checkbox (still visible, but can't be selected) when Guest Type is selected as Shared. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/e1135560 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e1135560 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e1135560 Branch: refs/heads/master Commit: e1135560239a16798db8db6854221a551053dd65 Parents: c0d39eb Author: Jessica Wang <[email protected]> Authored: Mon Nov 26 15:29:52 2012 -0800 Committer: Jessica Wang <[email protected]> Committed: Mon Nov 26 15:29:52 2012 -0800 ---------------------------------------------------------------------- ui/scripts/configuration.js | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e1135560/ui/scripts/configuration.js ---------------------------------------------------------------------- diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index c82b85f..a8ce108 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -1194,19 +1194,19 @@ return false; //break each loop } } - }); - if(havingVpcVirtualRouterForAtLeastOneService == true) { + }); + if(havingVpcVirtualRouterForAtLeastOneService == true || $guestTypeField.val() == 'Shared') { $conservemode.find("input[type=checkbox]").attr("disabled", "disabled"); - $conservemode.find("input[type=checkbox]").attr('checked', false); - + $conservemode.find("input[type=checkbox]").attr('checked', false); + $serviceSourceNatRedundantRouterCapabilityCheckbox.find("input[type=checkbox]").attr("disabled", "disabled"); $serviceSourceNatRedundantRouterCapabilityCheckbox.find("input[type=checkbox]").attr('checked', false); } - else { - $conservemode.find("input[type=checkbox]").removeAttr("disabled"); - $serviceSourceNatRedundantRouterCapabilityCheckbox.find("input[type=checkbox]").removeAttr("disabled"); - } - + else { + $serviceSourceNatRedundantRouterCapabilityCheckbox.find("input[type=checkbox]").removeAttr("disabled"); + $conservemode.find("input[type=checkbox]").removeAttr("disabled"); + } + $(':ui-dialog').dialog('option', 'position', 'center'); //CS-16612 show all services regardless of guestIpType(Shared/Isolated)
