Merge "Closes-Bug: #1523876 - Added a sorting comparator for status f…

…ields which needs to be passed as sort function to the column." into R2.20
Juniper · Dec 9, 2015 · 780be97 · 780be97
2 parents 603c3f2 + 8ea4043
commit 780be97
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 8 deletions.
diff --git a/webroot/monitor/infra/analyticsnode/ui/js/monitor_infra_analyticsnode_summary.js b/webroot/monitor/infra/analyticsnode/ui/js/monitor_infra_analyticsnode_summary.js
@@ -106,6 +106,12 @@ monitorInfraAnalyticsSummaryClass = (function() {
                         searchFn:function(d) {
                             return getNodeStatusContentForSummayPages(d,'text');
                         },
+                        sortable:{
+                            sortBy: function (d) {
+                                return getNodeStatusContentForSummayPages(d,'text');
+                            }
+                        },
+                        sorter:comparatorStatus,
                         minWidth:110,
                         exportConfig: {
             				allow: true,

diff --git a/webroot/monitor/infra/confignode/ui/js/monitor_infra_confignode_summary.js b/webroot/monitor/infra/confignode/ui/js/monitor_infra_confignode_summary.js
@@ -101,6 +101,12 @@ monitorInfraConfigSummaryClass = (function() {
                         searchFn:function(dc) {
                             return getNodeStatusContentForSummayPages(dc,'text');
                         },
+                        sortable:{
+                            sortBy: function (d) {
+                                return getNodeStatusContentForSummayPages(d,'text');
+                            }
+                        },
+                        sorter:comparatorStatus,
                         minWidth:110,
                         exportConfig: {
             				allow: true,

diff --git a/webroot/monitor/infra/controlnode/ui/js/monitor_infra_controlnode_summary.js b/webroot/monitor/infra/controlnode/ui/js/monitor_infra_controlnode_summary.js
@@ -103,6 +103,12 @@ monitorInfraControlSummaryClass = (function() {
                         searchFn:function(d) {
                             return getNodeStatusContentForSummayPages(d,'text');
                         },
+                        sortable:{
+                            sortBy: function (d) {
+                                return getNodeStatusContentForSummayPages(d,'text');
+                            }
+                        },
+                        sorter:comparatorStatus,
                         minWidth:150
                     },
                     {

diff --git a/webroot/monitor/infra/dbnode/ui/js/monitor_infra_dbnode_summary.js b/webroot/monitor/infra/dbnode/ui/js/monitor_infra_dbnode_summary.js
@@ -96,7 +96,13 @@ monitorInfraDatabaseSummaryClass = (function() {
                             advFormatter: function(dc) {
                                 return getNodeStatusContentForSummayPages(dc,'text');
                             }
-                        }
+                        },
+                        sortable:{
+                            sortBy: function (d) {
+                                return getNodeStatusContentForSummayPages(d,'text');
+                            }
+                        },
+                        sorter:comparatorStatus
                     },
                     {
                         field:"formattedAvailableSpace",

diff --git a/webroot/monitor/infra/vrouter/ui/js/monitor_infra_vrouter_summary.js b/webroot/monitor/infra/vrouter/ui/js/monitor_infra_vrouter_summary.js
@@ -307,13 +307,19 @@ monitorInfraComputeSummaryClass = (function() {
                         },
                         minWidth:150,
                         exportConfig: {
-            				allow: true,
-            				advFormatter: function(dc) {
-            					return getNodeStatusContentForSummayPages(dc,'text');
-            				}
-            			},                    
-            		},
-            		{
+                            allow: true,
+                            advFormatter: function(dc) {
+                                return getNodeStatusContentForSummayPages(dc,'text');
+                                }
+                        },
+                        sortable:{
+                            sortBy: function (d) {
+                                return getNodeStatusContentForSummayPages(d,'text');
+                            }
+                        },
+                        sorter:comparatorStatus
+                    },
+                    {
                         field:"vRouterType",
                         name:"Type",
                         formatter: function(r,c,v,cd,dc) {