diff options
| -rw-r--r-- | app/server-control/controllers/power-operations-controller.html | 2 | ||||
| -rw-r--r-- | app/server-control/controllers/power-operations-controller.js | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/app/server-control/controllers/power-operations-controller.html b/app/server-control/controllers/power-operations-controller.html index f015e1f..aa2ef54 100644 --- a/app/server-control/controllers/power-operations-controller.html +++ b/app/server-control/controllers/power-operations-controller.html @@ -19,7 +19,7 @@ </div> <span class="inactive-message" ng-show="dataService.server_state == 'Unreachable'">There are no power operations to display while a power operation is in progress. When complete, any new power operations will be displayed here.</span> <!-- Power on displays only when server is shutdown --> - <div class="row column power-option" ng-hide="dataService.server_state == 'Running' || dataService.server_state == 'Quiesced' || dataService.server_state == 'Unreachable'" ng-class="{disabled: dataService.server_unreachable || (confirm && !powerConfirm) || dataService.loading, transitionAll: confirm && powerConfirm}"> + <div class="row column power-option" ng-hide="dataService.server_state == 'Running' || dataService.server_state == 'Quiesced' || dataService.server_state == 'Unreachable'" ng-class="{disabled: dataService.server_unreachable || confirm || dataService.loading, transitionAll: confirm}"> <button id="power__power-on" class="btn-secondary inline" ng-click="powerOn()" role="button" ng-disabled="dataService.server_unreachable"><img src="../../assets/images/icon-power.svg" alt="power on" aria-hidden="true">Power on</button> <p class="inline">Attempts to power on the server</p> </div> diff --git a/app/server-control/controllers/power-operations-controller.js b/app/server-control/controllers/power-operations-controller.js index 83e6580..1ffb463 100644 --- a/app/server-control/controllers/power-operations-controller.js +++ b/app/server-control/controllers/power-operations-controller.js @@ -17,7 +17,6 @@ window.angular && (function(angular) { $interpolate, $q, toastService) { $scope.dataService = dataService; $scope.confirm = false; - $scope.powerConfirm = false; $scope.confirmWarmReboot = false; $scope.confirmColdReboot = false; $scope.confirmOrderlyShutdown = false; @@ -68,13 +67,6 @@ window.angular && (function(angular) { $scope.loading = false; }); }; - $scope.powerOnConfirm = function() { - if ($scope.confirm) { - return; - } - $scope.confirm = true; - $scope.powerConfirm = true; - }; function pollChassisStatusTillOff() { var deferred = $q.defer(); |
