Merge "Closes-bug: #1551713 - Need to make grid status messages consi…

…stent across all monitoring & config pages"
Juniper · Apr 21, 2016 · 4ae1ae5 · 4ae1ae5
2 parents ae72359 + b01a77f
commit 4ae1ae5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/webroot/js/common/qe.grid.config.js b/webroot/js/common/qe.grid.config.js
diff --git a/webroot/js/views/AlarmGridView.js b/webroot/js/views/AlarmGridView.js
@@ -194,12 +194,7 @@ define([
                        text: 'Loading Alarms..',
                     },
                     empty: {
-                       text: 'No Alarms to display'
-                    }, 
-                    errorGettingData: {
-                       type: 'error',
-                       iconClasses: 'icon-warning',
-                       text: 'Error in getting Data.'
+                       text: 'No Alarms Found.'
                     }
                  }
             },