Infrastructure UI: Fix list views with sub-sections

bfederle · bfederle · commit bd84005b4ee7 · 2013-06-19T12:24:58.000-07:00
diff --git 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() {
diff --git 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
+          }));
         };
       },
 
