Updated Branches:
refs/heads/vpc 7fb1e1395 -> 20b079075
CS-15809: Show account/domain fields on VPC detail view
Conflicts:
ui/scripts/network.js
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/20b07907
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/20b07907
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/20b07907
Branch: refs/heads/vpc
Commit: 20b0790753962a492b9388615d40692265bc2ce9
Parents: 7fb1e13
Author: Brian Federle <[email protected]>
Authored: Fri Aug 3 11:12:31 2012 -0700
Committer: Brian Federle <[email protected]>
Committed: Fri Aug 3 11:13:32 2012 -0700
----------------------------------------------------------------------
ui/scripts/network.js | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/20b07907/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 4f1b41d..02317dc 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -3833,13 +3833,15 @@
{
name: { label: 'label.name', isEditable: true }
},
- {
-
displaytext: { label: 'label.description', isEditable: true },
-
zonename: { label: 'label.zone' },
-
cidr: { label: 'label.cidr' },
-
networkdomain: { label: 'label.network.domain' },
-
state: { label: 'label.state' },
- id: { label: 'label.id' }
+ {
+ displaytext: { label: 'label.description', isEditable:
true },
+ account: { label: 'label.account' },
+ domain: { label: 'label.domain' },
+ zonename: { label: 'label.zone' },
+ cidr: { label: 'label.cidr' },
+ networkdomain: { label: 'label.network.domain' },
+ state: { label: 'label.state' },
+ id: { label: 'label.id' }
}
],
