summaryrefslogtreecommitdiffstats
path: root/app/server-control
diff options
context:
space:
mode:
authorGunnar Mills <gmills@us.ibm.com>2018-09-05 15:16:12 -0500
committerGunnar Mills <gmills@us.ibm.com>2018-09-10 13:44:50 +0000
commit6add8325ebf5c04731aa14ea4233de51fa897ef4 (patch)
tree6efd3ff166137f64d003a035315522386d556855 /app/server-control
parent83dcedf1082413bd0c82ebad76e3b206d6895fbc (diff)
downloadphosphor-webui-6add8325ebf5c04731aa14ea4233de51fa897ef4.tar.gz
phosphor-webui-6add8325ebf5c04731aa14ea4233de51fa897ef4.zip
Have loader wait for Last Power Operation
The loader (blue spinning half circle) should wait for the call to get the Last Power Operation Time. Change-Id: I105a5742244fb417cd3ab609e2c14771c28792cb Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
Diffstat (limited to 'app/server-control')
-rw-r--r--app/server-control/controllers/power-operations-controller.js27
1 files changed, 16 insertions, 11 deletions
diff --git a/app/server-control/controllers/power-operations-controller.js b/app/server-control/controllers/power-operations-controller.js
index 0b2fb58..e36b61d 100644
--- a/app/server-control/controllers/power-operations-controller.js
+++ b/app/server-control/controllers/power-operations-controller.js
@@ -22,7 +22,7 @@ window.angular && (function(angular) {
$scope.coldboot_confirm = false;
$scope.orderly_confirm = false;
$scope.immediately_confirm = false;
- $scope.loading = false;
+ $scope.loading = true;
var pollChassisStatusTimer = undefined;
var pollHostStatusTimer = undefined;
@@ -30,17 +30,22 @@ window.angular && (function(angular) {
//@TODO: call api and get proper state
- APIUtils.getLastPowerTime().then(
- function(data) {
- if (data.data == 0) {
- $scope.power_time = 'not available';
- } else {
- $scope.power_time = data.data;
- }
- },
- function(error) {
- console.log(JSON.stringify(error));
+ APIUtils.getLastPowerTime()
+ .then(
+ function(data) {
+ if (data.data == 0) {
+ $scope.power_time = 'not available';
+ } else {
+ $scope.power_time = data.data;
+ }
+ },
+ function(error) {
+ console.log(JSON.stringify(error));
+ })
+ .finally(function() {
+ $scope.loading = false;
});
+
$scope.toggleState = function() {
dataService.server_state =
(dataService.server_state == 'Running') ? 'Off' : 'Running';
OpenPOWER on IntegriCloud