Infrastructure UI: Fix list views with sub-sections
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bd84005b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bd84005b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bd84005b Branch: refs/heads/object_store Commit: bd84005b4ee7524d5a7f2b893f77474da421dbea Parents: 0dd14b1 Author: Brian Federle <[email protected]> Authored: Wed Jun 19 12:24:58 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Wed Jun 19 12:24:58 2013 -0700 ---------------------------------------------------------------------- ui/scripts/ui-custom/physicalResources.js | 3 ++- ui/scripts/ui-custom/zoneChart.js | 9 ++++----- 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd84005b/ui/scripts/ui-custom/physicalResources.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui-custom/physicalResources.js b/ui/scripts/ui-custom/physicalResources.js index 69c0295..65b87e4 100644 --- a/ui/scripts/ui-custom/physicalResources.js +++ b/ui/scripts/ui-custom/physicalResources.js @@ -18,8 +18,9 @@ cloudStack.uiCustom.physicalResources = function(args) { var listView = function(targetID) { var target = args.sections.physicalResources.listView[targetID]; + var listViewArgs = $.isFunction(target) ? target() : target; - return $('<div>').listView({ listView: $.isFunction(target) ? target() : target }); + return $('<div>').listView(listViewArgs.listView ? listViewArgs : { listView: listViewArgs }); }; var $dashboard = $('#template').find('.system-dashboard-view').clone(); var getData = function() { http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd84005b/ui/scripts/ui-custom/zoneChart.js ---------------------------------------------------------------------- diff --git a/ui/scripts/ui-custom/zoneChart.js b/ui/scripts/ui-custom/zoneChart.js index 12ba6aa..fcfc766 100644 --- a/ui/scripts/ui-custom/zoneChart.js +++ b/ui/scripts/ui-custom/zoneChart.js @@ -58,12 +58,11 @@ listView: function(targetID, context) { return function(args) { var $elem = args.$panel; - var listViewArgs = cloudStack.sections.system.subsections[targetID].listView; + var listView = cloudStack.sections.system.subsections[targetID]; - $elem.listView({ - context: context, - listView: listViewArgs - }); + $elem.listView($.extend(true, {}, listView, { + context: context + })); }; },
