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 2013/02/27 21:07:00 UTC

git commit: refs/heads/4.1 - Revert "CLOUDSTACK-452: cloudstack UI - network menu - guest network section - network detail - add IPv6 CIDR field, IPv6 Gateway field."

Updated Branches:
  refs/heads/4.1 cd888ddb5 -> 476687d93


Revert "CLOUDSTACK-452: cloudstack UI - network menu - guest network section - network detail - add IPv6 CIDR field, IPv6 Gateway field."

This reverts commit a565d0b699478849d88730faf8a9c9bf7892aef3.


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

Branch: refs/heads/4.1
Commit: 476687d931596bee0f50a08bdf107d6c505e0072
Parents: cd888dd
Author: Jessica Wang <je...@apache.org>
Authored: Wed Feb 27 12:06:46 2013 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Wed Feb 27 12:06:46 2013 -0800

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


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/476687d9/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index a6184e3..84cc067 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -896,10 +896,8 @@
                   if(zone.networktype == "Basic") {
                     hiddenFields.push("account");
                     hiddenFields.push("gateway");
-                    hiddenFields.push("ip6gateway");
                     hiddenFields.push("vlan");
                     hiddenFields.push("cidr");
-                    hiddenFields.push("ip6cidr");
                     //hiddenFields.push("netmask");
                   }
 
@@ -907,7 +905,6 @@
                     hiddenFields.push("networkofferingdisplaytext");
                     hiddenFields.push("networkdomaintext");
                     hiddenFields.push("gateway");
-                    hiddenFields.push("ip6gateway");
                     hiddenFields.push("networkofferingname");
                     //hiddenFields.push("netmask");
                   }
@@ -1002,11 +999,9 @@
                     },
 
                     gateway: { label: 'label.gateway' },
-                    ip6gateway: { label: 'IPv6 Gateway' },
 
                     //netmask: { label: 'label.netmask' },
                     cidr: { label: 'label.cidr' },
-                    ip6cidr: { label: 'IPv6 CIDR' },
 
                     networkdomaintext: {
                       label: 'label.network.domain.text'