apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

CS-12407: cloudstack 3.0 UI - Add F5 device - when Dedicated checkbox is checked, hide Capacity field and pass "capacity=1" to API.

Browse Source
This commit is contained in:
Jessica Wang 2012-04-24 10:50:53 -07:00
parent 71c9c6337b
commit 8e3fc39b67
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ui/scripts/system.js
View File

@ -2548,7 +2548,7 @@
}
},
//f5 provider detail view
//f5 provider detail view
f5: {
type: 'detailView',
id: 'f5Provider',
@ -2586,6 +2586,7 @@
label: 'label.add.F5.device',
createForm: {
title: 'label.add.F5.device',
preFilter: cloudStack.preFilter.addLoadBalancerDevice,
fields: {
ip: {
label: 'label.ip.address'
@ -2623,15 +2624,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 }
}
}
},
@ -4029,6 +4030,7 @@
label: 'label.add.netScaler.device',
createForm: {
title: 'label.add.netScaler.device',
preFilter: cloudStack.preFilter.addLoadBalancerDevice,
fields: {
ip: {
label: 'label.ip.address'
@ -4069,15 +4071,15 @@
// 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 }
}
}
},
action: function(args) {
@ -4223,6 +4225,7 @@
label: 'label.add.F5.device',
createForm: {
title: 'label.add.F5.device',
preFilter: cloudStack.preFilter.addLoadBalancerDevice,
fields: {
ip: {
label: 'label.ip.address'
@ -4260,15 +4263,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 }
}
}
},

11
ui/scripts/zoneWizard.js
View File

@ -511,6 +511,7 @@
},
basicPhysicalNetwork: { //"Netscaler" now
preFilter: cloudStack.preFilter.addLoadBalancerDevice,
fields: {
ip: {
label: 'label.ip.address'
@ -541,15 +542,15 @@
numretries: {
label: 'label.numretries',
defaultValue: '2'
},
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 }
}
}
},