Updated Branches:
  refs/heads/master 9d07ad8ec -> caf1206b1

Re-enable inline mode for SRX + F5

Now that inline mode is supported, re-enable mode drop-down for SRX
and F5 creation forms.


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/caf1206b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/caf1206b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/caf1206b

Branch: refs/heads/master
Commit: caf1206b15d58e1c78a4655425a648b8a5f8b7aa
Parents: 9d07ad8
Author: Brian Federle <[email protected]>
Authored: Tue Oct 16 12:10:54 2012 -0700
Committer: Brian Federle <[email protected]>
Committed: Tue Oct 16 12:13:31 2012 -0700

----------------------------------------------------------------------
 ui/scripts/system.js |   72 ++++++++++++++++++++++----------------------
 1 files changed, 36 insertions(+), 36 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/caf1206b/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 25bd995..fa16309 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -3268,15 +3268,15 @@
                       label: 'label.numretries',
                       defaultValue: '2'
                     },
-                    // inline: {
-                    //   label: 'Mode',
-                    //   select: function(args) {
-                    //     var items = [];
-                    //     items.push({id: "false", description: "side by 
side"});
-                    //     items.push({id: "true", description: "inline"});
-                    //     args.response.success({data: items});
-                    //   }
-                    // },                    
+                    inline: {
+                      label: 'Mode',
+                      select: function(args) {
+                        var items = [];
+                        items.push({id: "false", description: "side by side"});
+                        items.push({id: "true", description: "inline"});
+                        args.response.success({data: items});
+                      }
+                    },                    
                     dedicated: {
                       label: 'label.dedicated',
                       isBoolean: true,
@@ -3507,15 +3507,15 @@
                       label: 'label.timeout',
                       defaultValue: '300'
                     },
-                    // inline: {
-                    //   label: 'Mode',
-                    //   select: function(args) {
-                    //     var items = [];
-                    //     items.push({id: "false", description: "side by 
side"});
-                    //     items.push({id: "true", description: "inline"});
-                    //     args.response.success({data: items});
-                    //   }
-                    // },
+                    inline: {
+                      label: 'Mode',
+                      select: function(args) {
+                        var items = [];
+                        items.push({id: "false", description: "side by side"});
+                        items.push({id: "true", description: "inline"});
+                        args.response.success({data: items});
+                      }
+                    },
                     publicnetwork: {
                       label: 'label.public.network',
                       defaultValue: 'untrusted'
@@ -6005,15 +6005,15 @@
                     label: 'label.numretries',
                     defaultValue: '2'
                   },
-                  // inline: {
-                  //   label: 'Mode',
-                  //   select: function(args) {
-                  //     var items = [];
-                  //     items.push({id: "false", description: "side by 
side"});
-                  //     items.push({id: "true", description: "inline"});
-                  //     args.response.success({data: items});
-                  //   }
-                  // },
+                  inline: {
+                    label: 'Mode',
+                    select: function(args) {
+                      var items = [];
+                      items.push({id: "false", description: "side by side"});
+                      items.push({id: "true", description: "inline"});
+                      args.response.success({data: items});
+                    }
+                  },
                   dedicated: {
                     label: 'label.dedicated',
                     isBoolean: true,
@@ -6197,15 +6197,15 @@
                     label: 'label.numretries',
                     defaultValue: '2'
                   },
-                  // inline: {
-                  //   label: 'Mode',
-                  //   select: function(args) {
-                  //     var items = [];
-                  //     items.push({id: "false", description: "side by 
side"});
-                  //     items.push({id: "true", description: "inline"});
-                  //     args.response.success({data: items});
-                  //   }
-                  // },                  
+                  inline: {
+                    label: 'Mode',
+                    select: function(args) {
+                      var items = [];
+                      items.push({id: "false", description: "side by side"});
+                      items.push({id: "true", description: "inline"});
+                      args.response.success({data: items});
+                    }
+                  },                 
                   dedicated: {
                     label: 'label.dedicated',
                     isBoolean: true,

Reply via email to