Updated Branches: refs/heads/master e0860d5a4 -> e5db0ebc0
CS-15126 -Hide 'type' field, as dvSwitch doesn't return a type -Get zone name from the cluster's data reviewed-by: jessica Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/7c1698fb Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/7c1698fb Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/7c1698fb Branch: refs/heads/master Commit: 7c1698fb15430013affbb3838e4c9655fd276c7b Parents: e0860d5 Author: Brian Federle <[email protected]> Authored: Tue May 29 11:44:39 2012 -0700 Committer: bfederle <[email protected]> Committed: Tue Jun 19 11:11:11 2012 -0700 ---------------------------------------------------------------------- ui/scripts/system.js | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/7c1698fb/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index c5a236a..60722cb 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -6493,7 +6493,6 @@ id: 'vSwitches', fields: { vsmdeviceid: { label: 'label.name' }, - type: { label: 'label.type' }, zonename: { label: 'label.zone' }, vsmdevicestate: { label: 'label.state' } }, @@ -6638,7 +6637,9 @@ var item = json.listcisconexusvsmscmdresponse.cisconexusvsm; args.response.success({ actionFilter: nexusActionfilter, - data: item + data: $.extend(item, { + zonename: args.context.clusters[0].zonename + }) }); }, error: function(json) {
