From 71c9c6337b08efd96687becd94724decf44ae719 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Mon, 23 Apr 2012 16:34:15 -0700 Subject: [PATCH] CS-12407: cloudstack 3.0 UI - Add Netscaler device - when Dedicated checkbox is checked, hide Capacity field and pass "capacity=1" to API. --- ui/scripts/sharedFunctions.js | 16 +++++++++++++++- ui/scripts/system.js | 13 +++++++------ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index 594f7cc01ac..ba884269754 100644 --- a/ui/scripts/sharedFunctions.js +++ b/ui/scripts/sharedFunctions.js @@ -226,7 +226,21 @@ cloudStack.preFilter = { } args.$form.find('.form-item[rel=isFeatured]').hide(); } - } + }, + addLoadBalancerDevice: function(args) { //add netscaler device OR add F5 device + args.$form.bind('change', function() { + var $dedicated = args.$form.find('.form-item[rel=dedicated]'); + var $capacity = args.$form.find('.form-item[rel=capacity]'); + if($dedicated.find('input[type=checkbox]:checked').length > 0) { + $capacity.hide(); + $capacity.find('input[type=text]').val('1'); + } + else if($dedicated.find('input[type=checkbox]:unchecked').length > 0) { + $capacity.css('display', 'inline-block'); + } + }); + args.$form.change(); + } } cloudStack.actionFilter = { diff --git a/ui/scripts/system.js b/ui/scripts/system.js index aa7e68b2cfc..c6e6b0b2e5b 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -2349,7 +2349,8 @@ add: { label: 'label.add.netScaler.device', createForm: { - title: 'label.add.netScaler.device', + title: 'label.add.netScaler.device', + preFilter: cloudStack.preFilter.addLoadBalancerDevice, fields: { ip: { label: 'label.ip.address' @@ -2389,15 +2390,15 @@ // items.push({id: "true", description: "inline"}); // args.response.success({data: items}); // } - // }, - capacity: { - label: 'label.capacity', - validation: { required: false, number: true } - }, + // }, dedicated: { label: 'label.dedicated', isBoolean: true, isChecked: false + }, + capacity: { + label: 'label.capacity', + validation: { required: false, number: true } } } },