cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/master to c350999
Date Mon, 04 Nov 2013 23:37:20 GMT
Updated Branches:
  refs/heads/master e60037cb8 -> c350999c9


CLOUDSTACK-730: UI > VPC > Router > site-to-site VPN > VPN Connection > detailView
> add "Passive" field.


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

Branch: refs/heads/master
Commit: c350999c932dcafbc2fbe592ba6b7ce38d443d50
Parents: e60037c
Author: Jessica Wang <jessicawang@apache.org>
Authored: Mon Nov 4 15:34:48 2013 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Mon Nov 4 15:36:47 2013 -0800

----------------------------------------------------------------------
 ui/scripts/vpc.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c350999c/ui/scripts/vpc.js
----------------------------------------------------------------------
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 2dc9162..9775f60 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -2858,13 +2858,13 @@
                                         id: {
                                             label: 'label.id'
                                         },
-
-                                        //s2svpngatewayid: { label: 'VPN gateway ID' },
+                                        passive: {
+                                            label: 'Passive',
+                                            converter: cloudStack.converters.toBooleanText
+                                        },                                              
                                 
                                         publicip: {
                                             label: 'label.ip.address'
-                                        },
-
-                                        //s2scustomergatewayid: { label: 'Customer gateway
ID' },
+                                        },                                        
                                         gateway: {
                                             label: 'label.gateway'
                                         },


Mime
View raw message