Updated Branches: refs/heads/master 8c5671f4f -> 89b54596f
CLOUDSTACK-4508: UI > Infrastructure > clusters > add cluster dialog > make NexusVSM fields required only when Override Traffic is checked AND vSwitch Type is "Cisco Nexus 1000v Distributed Virtual Switch". Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/29f55d95 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/29f55d95 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/29f55d95 Branch: refs/heads/master Commit: 29f55d956b86b5c57f45ef416d9eeab34d00888e Parents: 8c5671f Author: Jessica Wang <[email protected]> Authored: Mon Aug 26 15:59:18 2013 -0700 Committer: Jessica Wang <[email protected]> Committed: Mon Aug 26 17:05:03 2013 -0700 ---------------------------------------------------------------------- ui/scripts/system.js | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/29f55d95/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index e6bf03a..07b0bb8 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -10292,8 +10292,13 @@ // // ** This is done by switching out optional fields for required fields; // need to check for *either* vsm[...]_req or vsm[...] - var $overrideGuestTraffic = $form.find('.form-item[rel=overrideguesttraffic] input[type=checkbox]'); + var $overridePublicTraffic = $form.find('.form-item[rel=overridepublictraffic] input[type=checkbox]'); + var $vSwitchPublicType = $form.find('.form-item[rel=vSwitchPublicType] select'); + + var $overrideGuestTraffic = $form.find('.form-item[rel=overrideguesttraffic] input[type=checkbox]'); + var $vSwitchGuestType = $form.find('.form-item[rel=vSwitchGuestType] select'); + var $vsmFields = $form.find('.form-item').filter(function() { var vsmFields = [ 'vsmipaddress', @@ -10314,8 +10319,8 @@ }); - if ($overridePublicTraffic.is(':checked') || - $overrideGuestTraffic.is(':checked')) { + if (($overridePublicTraffic.is(':checked') && $vSwitchPublicType.val() == 'nexusdvs') || + ($overrideGuestTraffic.is(':checked') && $vSwitchGuestType.val() == 'nexusdvs' )) { $vsmReqFields.css('display', 'inline-block'); $vsmFields.hide(); } else {
