You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2012/08/16 20:24:39 UTC

git commit: CS-16018: cloudstack 3.0 UI - create VPN Customer Gateway - IKE DH, Perfect Forward Secrecy dropdown - restore blank option back and label it as "None".

Updated Branches:
  refs/heads/master 335730dc6 -> e6130d338


CS-16018: cloudstack 3.0 UI - create VPN Customer Gateway - IKE DH, Perfect Forward Secrecy dropdown - restore blank option back and label it as "None".


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

Branch: refs/heads/master
Commit: e6130d3384185aa0e4da55b9be6eac03b4b76044
Parents: 335730d
Author: Jessica Wang <je...@citrix.com>
Authored: Thu Aug 16 11:07:48 2012 -0700
Committer: Jessica Wang <je...@citrix.com>
Committed: Thu Aug 16 11:24:02 2012 -0700

----------------------------------------------------------------------
 ui/scripts/network.js |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/e6130d33/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index e4081eb..6e8fd26 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -4028,7 +4028,7 @@
                     label: 'IKE DH',
                     select: function(args) {
                       var items = [];
-                    //  items.push({id: '', description: ''});
+                      items.push({id: '', description: 'None'});
                       items.push({id: 'modp1024', description: 'Group 2(modp1024)'});
                       items.push({id: 'modp1536', description: 'Group 5(modp1536)'});										 
                       args.response.success({data: items});
@@ -4060,7 +4060,7 @@
                     label: 'Perfect Forward Secrecy',
                     select: function(args) {
                       var items = [];
-                   //   items.push({id: '', description: ''});
+                      items.push({id: '', description: 'None'});
                       items.push({id: 'modp1024', description: 'Group 2(modp1024)'});
                       items.push({id: 'modp1536', description: 'Group 5(modp1536)'});										 
                       args.response.success({data: items});
@@ -4284,7 +4284,7 @@
 											isEditable: true,
 											select: function(args) {
 												var items = [];
-												items.push({id: '', description: ''});
+												items.push({id: '', description: 'None'});
 												items.push({id: 'modp1024', description: 'Group 2(modp1024)'});
                         items.push({id: 'modp1536', description: 'Group 5(modp1536)'});												 
 												args.response.success({data: items});
@@ -4319,7 +4319,7 @@
 											isEditable: true,
 											select: function(args) {
 												var items = [];
-												items.push({id: '', description: ''});
+												items.push({id: '', description: 'None'});
 												items.push({id: 'modp1024', description: 'Group 2(modp1024)'});
                         items.push({id: 'modp1536', description: 'Group 5(modp1536)'});												 
 												args.response.success({data: items});