commit 96bbf31065b3d7a27816c9344002803619d9e3fc
author Iftekharul Islam <iffy.ryan@ibm.com> Tue Aug 22 13:44:38 2017 -0500
committer Adriana Kobylak <anoo@us.ibm.com> Mon Oct 09 14:13:43 2017 -0500
tree 799b12ed7590c0fe0328ac37aceab45332759617
parent ba556c310594af3daa22bc96abee55af9ce23ab2

Updated master after merge conflicts

Change-Id: Ibea933c20071cc85201420ba1e31fedf9356f55b
Signed-off-by: Iftekharul Islam <iffy.ryan@ibm.com>

app/server-health/controllers/sensors-overview-controller.js

diff --git a/app/server-health/controllers/sensors-overview-controller.js b/app/server-health/controllers/sensors-overview-controller.js
index 57e3b65..6d33604 100644
--- a/app/server-health/controllers/sensors-overview-controller.js
+++ b/app/server-health/controllers/sensors-overview-controller.js
@@ -76,7 +76,6 @@
                     }
 
                     if($scope.selectedSeverity.all){
-                        $scope.selectedSeverity.normal = false;
                         $scope.selectedSeverity.warning = false;
                         $scope.selectedSeverity.critical = false;
                     }
@@ -85,11 +84,19 @@
                 $scope.toggleSeverity = function(severity){
                     $scope.selectedSeverity[severity] = !$scope.selectedSeverity[severity];
 
-                    if($scope.selectedSeverity.normal && 
-                       $scope.selectedSeverity.warning && 
+                   if(['warning', 'critical'].indexOf(severity) > -1){
+                       if($scope.selectedSeverity[severity] == false &&
+                          (!$scope.selectedSeverity.warning &&
+                           !$scope.selectedSeverity.critical
+                          )){
+                           $scope.selectedSeverity.all = true;
+                           return;
+                       }
+                   }
+
+                    if($scope.selectedSeverity.warning && 
                        $scope.selectedSeverity.critical){
                         $scope.selectedSeverity.all = true;
-                        $scope.selectedSeverity.normal = false;
                         $scope.selectedSeverity.warning = false;
                         $scope.selectedSeverity.critical = false;
                     }else{