You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2012/06/19 20:11:53 UTC
[2/4] git commit: CS-15126: Removing the zone field for now
CS-15126: Removing the zone field for now
Conflicts:
ui/scripts/system.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/920eadff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/920eadff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/920eadff
Branch: refs/heads/master
Commit: 920eadffd576e52251c73ba53d3a2f78c987fa3f
Parents: 0738296
Author: Brian Federle <br...@citrix.com>
Authored: Wed May 30 09:44:32 2012 -0700
Committer: bfederle <bf...@gmail.com>
Committed: Tue Jun 19 11:11:11 2012 -0700
----------------------------------------------------------------------
ui/scripts/system.js | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/920eadff/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 9ab0a39..e304951 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -6488,7 +6488,6 @@
id: 'vSwitches',
fields: {
vsmdeviceid: { label: 'label.name' },
- zonename: { label: 'label.zone' },
vsmdevicestate: { label: 'label.state' }
},
detailView: {
@@ -6632,9 +6631,7 @@
var item = json.listcisconexusvsmscmdresponse.cisconexusvsm;
args.response.success({
actionFilter: nexusActionfilter,
- data: $.extend(item, {
- zonename: args.context.clusters[0].zonename
- })
+ data: item
});
},
error: function(json) {