diff options
Diffstat (limited to 'app/server-control')
3 files changed, 18 insertions, 15 deletions
diff --git a/app/server-control/controllers/power-operations-controller.js b/app/server-control/controllers/power-operations-controller.js index 1bb0a81..1a1f355 100644 --- a/app/server-control/controllers/power-operations-controller.js +++ b/app/server-control/controllers/power-operations-controller.js @@ -11,10 +11,10 @@ window.angular && (function(angular) { angular.module('app.serverControl').controller('powerOperationsController', [ '$scope', 'APIUtils', 'dataService', 'Constants', '$timeout', '$interval', - '$interpolate', '$q', 'ngToast', + '$interpolate', '$q', 'toastService', function( $scope, APIUtils, dataService, Constants, $timeout, $interval, - $interpolate, $q, ngToast) { + $interpolate, $q, toastService) { $scope.dataService = dataService; $scope.confirm = false; $scope.power_confirm = false; @@ -64,7 +64,7 @@ window.angular && (function(angular) { $scope.loading = false; }) .catch(function(error) { - ngToast.danger(Constants.MESSAGES.POWER_OP.POWER_ON_FAILED); + toastService.error(Constants.MESSAGES.POWER_OP.POWER_ON_FAILED); $scope.loading = false; }); }; @@ -118,7 +118,8 @@ window.angular && (function(angular) { $scope.loading = false; }) .catch(function(error) { - ngToast.danger(Constants.MESSAGES.POWER_OP.WARM_REBOOT_FAILED); + toastService.error( + Constants.MESSAGES.POWER_OP.WARM_REBOOT_FAILED); $scope.loading = false; }); }; @@ -161,7 +162,8 @@ window.angular && (function(angular) { $scope.loading = false; }) .catch(function(error) { - ngToast.danger(Constants.MESSAGES.POWER_OP.COLD_REBOOT_FAILED); + toastService.error( + Constants.MESSAGES.POWER_OP.COLD_REBOOT_FAILED); $scope.loading = false; }); }; @@ -191,7 +193,7 @@ window.angular && (function(angular) { $scope.loading = false; }) .catch(function(error) { - ngToast.danger( + toastService.error( Constants.MESSAGES.POWER_OP.ORDERLY_SHUTDOWN_FAILED); $scope.loading = false; }); @@ -220,7 +222,7 @@ window.angular && (function(angular) { $scope.loading = false; }) .catch(function(error) { - ngToast.danger( + toastService.error( Constants.MESSAGES.POWER_OP.IMMEDIATE_SHUTDOWN_FAILED); $scope.loading = false; }); diff --git a/app/server-control/controllers/power-usage-controller.js b/app/server-control/controllers/power-usage-controller.js index 5dc848e..9398259 100644 --- a/app/server-control/controllers/power-usage-controller.js +++ b/app/server-control/controllers/power-usage-controller.js @@ -10,8 +10,8 @@ window.angular && (function(angular) { 'use strict'; angular.module('app.serverControl').controller('powerUsageController', [ - '$scope', '$window', 'APIUtils', '$route', '$q', 'ngToast', - function($scope, $window, APIUtils, $route, $q, ngToast) { + '$scope', '$window', 'APIUtils', '$route', '$q', 'toastService', + function($scope, $window, APIUtils, $route, $q, toastService) { $scope.power_consumption = ''; $scope.power_cap = {}; $scope.loading = false; @@ -49,7 +49,8 @@ window.angular && (function(angular) { $scope.setPowerCap = function() { // The power cap value will be undefined if outside range if (!$scope.power_cap.PowerCap) { - ngToast.danger('Power cap value between 100 and 10,000 is required'); + toastService.error( + 'Power cap value between 100 and 10,000 is required'); return; } $scope.loading = true; @@ -61,10 +62,10 @@ window.angular && (function(angular) { $q.all(promises) .then( function() { - ngToast.success('Power cap settings saved'); + toastService.success('Power cap settings saved'); }, function(errors) { - ngToast.danger('Power cap settings could not be saved'); + toastService.error('Power cap settings could not be saved'); }) .finally(function() { $scope.loading = false; diff --git a/app/server-control/controllers/server-led-controller.js b/app/server-control/controllers/server-led-controller.js index 96ea064..f44bcc0 100644 --- a/app/server-control/controllers/server-led-controller.js +++ b/app/server-control/controllers/server-led-controller.js @@ -10,8 +10,8 @@ window.angular && (function(angular) { 'use strict'; angular.module('app.serverControl').controller('serverLEDController', [ - '$scope', '$window', '$route', 'APIUtils', 'dataService', 'ngToast', - function($scope, $window, $route, APIUtils, dataService, ngToast) { + '$scope', '$window', '$route', 'APIUtils', 'dataService', 'toastService', + function($scope, $window, $route, APIUtils, dataService, toastService) { $scope.dataService = dataService; APIUtils.getLEDState().then(function(state) { @@ -39,7 +39,7 @@ window.angular && (function(angular) { .then( function(response) {}, function(errors) { - ngToast.danger( + toastService.error( 'Failed to turn LED light ' + (toggleState ? 'on' : 'off')); console.log(JSON.stringify(errors)); |
