Merge "Closes-Bug: #1597347 Fixed the issue in sorting overlapped nod…

…es in scatter chart with color priroirty (red->orange->green->blue)" into R3.1
Juniper · Aug 6, 2016 · d5e7c97 · d5e7c97
2 parents ebeba4d + 6aca1fb
commit d5e7c97
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/webroot/monitor/infrastructure/dashboard/ui/js/views/VRouterDashboardView.js b/webroot/monitor/infrastructure/dashboard/ui/js/views/VRouterDashboardView.js
@@ -32,7 +32,7 @@ define(
                             }
                             cfDataSource.addCallBack('updateCFListModel',function(data) {
                                 //Update listUIModel with crossfilter data
-                                vRouterUIListModel.setData(cfDataSource.getFilteredData());
+                                vRouterUIListModel.setData(cfDataSource.getFilteredData().sort(dashboardUtils.sortNodesByColor));
                             });
                             this.renderView4Config(self.$el,
                                 vRouterUIListModel,

diff --git a/webroot/monitor/infrastructure/vrouter/ui/js/views/VRouterListView.js b/webroot/monitor/infrastructure/vrouter/ui/js/views/VRouterListView.js
@@ -74,7 +74,7 @@ define(
                     if(data['cfg']['source'] != 'grid') {
                         //Need to get the data after filtering from dimensions other than gridFilter
                         var currGridFilter = cfDataSource.removeFilter('gridFilter');
-                        vRouterUIListModel.setData(cfDataSource.getDimension('gridFilter').top(Infinity));
+                        vRouterUIListModel.setData(cfDataSource.getDimension('gridFilter').top(Infinity).sort(dashboardUtils.sortNodesByColor));
                         if(currGridFilter != null) {
                             cfDataSource.applyFilter('gridFilter',currGridFilter);
                         }