Server health icon status on header fixed
Change-Id: I06100d8ffe9e26129585ca9476fa7097ef34a6b4
Signed-off-by: Iftekharul Islam <iffy.ryan@ibm.com>
diff --git a/app/server-health/controllers/inventory-controller.html b/app/server-health/controllers/inventory-controller.html
index 7506954..1a2952d 100644
--- a/app/server-health/controllers/inventory-controller.html
+++ b/app/server-health/controllers/inventory-controller.html
@@ -564,4 +564,4 @@
</div>
</section>
<paginate ng-include="paginate"></paginate>
-</div> <!-- end event log -->
+</div> <!-- end event log -->
\ No newline at end of file
diff --git a/app/server-health/controllers/inventory-overview-controller.js b/app/server-health/controllers/inventory-overview-controller.js
index fae3a09..7a62d40 100644
--- a/app/server-health/controllers/inventory-overview-controller.js
+++ b/app/server-health/controllers/inventory-overview-controller.js
@@ -25,8 +25,8 @@
$scope.searchTerms = [];
$scope.loading = false;
+ $scope.loading = true;
APIUtils.getHardwares(function(data, originalData){
- $scope.loading = true;
$scope.hardwares = data;
$scope.originalData = JSON.stringify(originalData);
$scope.loading = false;
diff --git a/app/server-health/controllers/log-controller.js b/app/server-health/controllers/log-controller.js
index c6b4d8f..963c6c0 100644
--- a/app/server-health/controllers/log-controller.js
+++ b/app/server-health/controllers/log-controller.js
@@ -70,6 +70,7 @@
}
expandedSelectedIdOnce = true;
}
+ dataService.updateServerHealth(result.data);
$scope.logs = result.data;
$scope.originalData = result.original;
$scope.loading = false;
@@ -88,7 +89,6 @@
);
}
-
$scope.filterByStatus = function(log){
if ($scope.selectedStatus.all) return true;
return( (log.Resolved && $scope.selectedStatus.resolved)||
diff --git a/app/server-health/controllers/sensors-controller.html b/app/server-health/controllers/sensors-controller.html
index caad20e..8544ebb 100644
--- a/app/server-health/controllers/sensors-controller.html
+++ b/app/server-health/controllers/sensors-controller.html
@@ -83,4 +83,4 @@
</div>
</section>
-</div> <!-- end event log -->
+</div> <!-- end event log -->
\ No newline at end of file
diff --git a/app/server-health/controllers/sensors-overview-controller.html b/app/server-health/controllers/sensors-overview-controller.html
index efd60a5..e0accde 100644
--- a/app/server-health/controllers/sensors-overview-controller.html
+++ b/app/server-health/controllers/sensors-overview-controller.html
@@ -57,4 +57,4 @@
<p class="inline sensor__reading"><span class="sensor__label">High critical</span>{{sensor.CriticalHigh}}<span class="content-label">{{sensor.unit}}<span ng-if="sensor.unit == 'C'">°</span></p>
</div>
</section>
-</div>
+</div>
\ No newline at end of file
diff --git a/app/server-health/controllers/sensors-overview-controller.js b/app/server-health/controllers/sensors-overview-controller.js
index 6d33604..ed74d04 100644
--- a/app/server-health/controllers/sensors-overview-controller.js
+++ b/app/server-health/controllers/sensors-overview-controller.js
@@ -70,10 +70,7 @@
}
$scope.toggleSeverityAll = function(){
-
- if($scope.selectedSeverity.all !== true){
- $scope.selectedSeverity.all = !$scope.selectedSeverity.all;
- }
+ $scope.selectedSeverity.all = !$scope.selectedSeverity.all;
if($scope.selectedSeverity.all){
$scope.selectedSeverity.warning = false;
diff --git a/app/server-health/controllers/unit-id-controller.html b/app/server-health/controllers/unit-id-controller.html
index 23f5b1b..bc9c345 100644
--- a/app/server-health/controllers/unit-id-controller.html
+++ b/app/server-health/controllers/unit-id-controller.html
@@ -25,4 +25,4 @@
</div>
</div>
</div>
-</div>
+</div>
\ No newline at end of file