Merge "Closes-Bug: #1554468 - Set the row height for the grid which w…

…ill automatically enable the ellipses if the text is longer than the column width" into R3.0
Juniper · Apr 25, 2016 · 7b98bcd · 7b98bcd
2 parents 5cca099 + 7d78382
commit 7b98bcd
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/webroot/monitor/infrastructure/analyticsnode/ui/js/views/AnalyticsNodeSummaryGridView.js b/webroot/monitor/infrastructure/analyticsnode/ui/js/views/AnalyticsNodeSummaryGridView.js
@@ -170,7 +170,8 @@ define([ 'underscore', 'contrail-view' ],function(_, ContrailView) {
                         options : {
                           detail : false,
                           enableAsyncPostRender:true,
-                          checkboxSelectable : false
+                          checkboxSelectable : false,
+                          fixedRowHeight: 30
                         },
                         dataSource : {
                             remote : {

diff --git a/webroot/monitor/infrastructure/common/ui/js/utils/monitor.infra.utils.js b/webroot/monitor/infrastructure/common/ui/js/utils/monitor.infra.utils.js
@@ -1281,8 +1281,7 @@ define([
             var obj = getNodeStatusForSummaryPages(data);
             if(obj['alerts'].length > 0) {
                 if(type == 'html')
-                    return '<span title="'+obj['messages'].join(',&#10 ')+
-                        '" class=\"infra-nodesatus-text-ellipsis\">'+
+                    return '<span title="'+obj['messages'].join(',&#10 ') + '" >'+
                         obj['messages'].join(',')+'</span>';
                 else if(type == 'text')
                     return obj['messages'].join(',');

diff --git a/webroot/monitor/infrastructure/confignode/ui/js/views/ConfigNodeSummaryGridView.js b/webroot/monitor/infrastructure/confignode/ui/js/views/ConfigNodeSummaryGridView.js
@@ -159,7 +159,8 @@ define(
                         options : {
                           detail : false,
                           enableAsyncPostRender:true,
-                          checkboxSelectable : false
+                          checkboxSelectable : false,
+                          fixedRowHeight: 30
                         },
                         dataSource : {
                         }

diff --git a/webroot/monitor/infrastructure/controlnode/ui/js/views/ControlNodeSummaryGridView.js b/webroot/monitor/infrastructure/controlnode/ui/js/views/ControlNodeSummaryGridView.js
@@ -164,7 +164,8 @@ define(
                         options : {
                           detail : false,
                           checkboxSelectable : false,
-                          enableAsyncPostRender:true
+                          enableAsyncPostRender:true,
+                          fixedRowHeight: 30
                         },
                         dataSource : {
                             remote : {

diff --git a/webroot/monitor/infrastructure/databasenode/ui/js/views/DatabaseNodeSummaryGridView.js b/webroot/monitor/infrastructure/databasenode/ui/js/views/DatabaseNodeSummaryGridView.js
@@ -140,7 +140,8 @@ define(
                     body : {
                         options : {
                           detail : false,
-                          checkboxSelectable : false
+                          checkboxSelectable : false,
+                          fixedRowHeight: 30
                         },
                         dataSource : {
                             remote : {

diff --git a/webroot/monitor/infrastructure/vrouter/ui/js/views/VRouterSummaryGridView.js b/webroot/monitor/infrastructure/vrouter/ui/js/views/VRouterSummaryGridView.js
@@ -186,7 +186,8 @@ define(
                           lazyLoading: false,
                           detail : false,
                           enableAsyncPostRender:true,
-                          checkboxSelectable : false
+                          checkboxSelectable : false,
+                          fixedRowHeight: 30
                         },
                         dataSource : {
                             remote : {