From f78874d825b66dcc36ace61ba74d65956f94893d Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Tue, 24 Apr 2012 10:50:53 -0700
Subject: [PATCH] CS-12407: cloudstack 3.0 UI - Add F5 device - when Dedicated
 checkbox is checked, hide Capacity field and pass "capacity=1" to API.

---
 ui/scripts/system.js     | 35 +++++++++++++++++++----------------
 ui/scripts/zoneWizard.js | 11 ++++++-----
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index c6e6b0b2e5b..75d91fb06c6 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -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 }
                   }
                 }
               },
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index a92ec9f8f86..a8cbbc79b26 100644
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -513,6 +513,7 @@
       },
 
       basicPhysicalNetwork: { //"Netscaler" now
+			  preFilter: cloudStack.preFilter.addLoadBalancerDevice,	
         fields: {
          ip: {
             label: 'label.ip.address'
@@ -543,15 +544,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 }
           }
         }
       },