diff --git a/app/components/createContainer/createContainerController.js b/app/components/createContainer/createContainerController.js index 7258a5fab..65c9fe817 100644 --- a/app/components/createContainer/createContainerController.js +++ b/app/components/createContainer/createContainerController.js @@ -21,7 +21,7 @@ function ($q, $scope, $state, $timeout, $transition$, $filter, Container, Contai $scope.state = { formValidationError: '', - deploymentInProgress: false + actionInProgress: false }; $scope.refreshSlider = function () { @@ -580,7 +580,7 @@ function ($q, $scope, $state, $timeout, $transition$, $filter, Container, Contai return; } - $scope.state.deploymentInProgress = true; + $scope.state.actionInProgress = true; var config = prepareConfiguration(); createContainer(config, accessControlData); }) @@ -606,7 +606,7 @@ function ($q, $scope, $state, $timeout, $transition$, $filter, Container, Contai Notifications.error('Failure', err, 'Unable to create container'); }) .finally(function final() { - $scope.state.deploymentInProgress = false; + $scope.state.actionInProgress = false; }); }); } diff --git a/app/components/createContainer/createcontainer.html b/app/components/createContainer/createcontainer.html index d368d4fd7..9f6edae53 100644 --- a/app/components/createContainer/createcontainer.html +++ b/app/components/createContainer/createcontainer.html @@ -112,9 +112,9 @@
- {{ state.formValidationError }} diff --git a/app/components/createNetwork/createNetworkController.js b/app/components/createNetwork/createNetworkController.js index 33a60dcb0..a973e4632 100644 --- a/app/components/createNetwork/createNetworkController.js +++ b/app/components/createNetwork/createNetworkController.js @@ -12,7 +12,7 @@ function ($q, $scope, $state, PluginService, Notifications, NetworkService, Labe $scope.state = { formValidationError: '', - deploymentInProgress: false + actionInProgress: false }; $scope.availableNetworkDrivers = []; @@ -99,7 +99,7 @@ function ($q, $scope, $state, PluginService, Notifications, NetworkService, Labe return; } - $scope.state.deploymentInProgress = true; + $scope.state.actionInProgress = true; NetworkService.create(networkConfiguration) .then(function success(data) { var networkIdentifier = data.Id; @@ -114,7 +114,7 @@ function ($q, $scope, $state, PluginService, Notifications, NetworkService, Labe Notifications.error('Failure', err, 'An error occured during network creation'); }) .finally(function final() { - $scope.state.deploymentInProgress = false; + $scope.state.actionInProgress = false; }); }; diff --git a/app/components/createNetwork/createnetwork.html b/app/components/createNetwork/createnetwork.html index 2d85187dc..20beaf626 100644 --- a/app/components/createNetwork/createnetwork.html +++ b/app/components/createNetwork/createnetwork.html @@ -128,9 +128,9 @@
- {{ state.formValidationError }} diff --git a/app/components/createRegistry/createRegistryController.js b/app/components/createRegistry/createRegistryController.js index b8dbe77a2..370c62e72 100644 --- a/app/components/createRegistry/createRegistryController.js +++ b/app/components/createRegistry/createRegistryController.js @@ -4,7 +4,7 @@ function ($scope, $state, RegistryService, Notifications) { $scope.state = { RegistryType: 'quay', - deploymentInProgress: false + actionInProgress: false }; $scope.formValues = { @@ -34,7 +34,7 @@ function ($scope, $state, RegistryService, Notifications) { var username = $scope.formValues.Username; var password = $scope.formValues.Password; - $scope.state.deploymentInProgress = true; + $scope.state.actionInProgress = true; RegistryService.createRegistry(registryName, registryURL, authentication, username, password) .then(function success(data) { Notifications.success('Registry successfully created'); @@ -44,7 +44,7 @@ function ($scope, $state, RegistryService, Notifications) { Notifications.error('Failure', err, 'Unable to create registry'); }) .finally(function final() { - $scope.state.deploymentInProgress = false; + $scope.state.actionInProgress = false; }); }; }]); diff --git a/app/components/createRegistry/createregistry.html b/app/components/createRegistry/createregistry.html index 177b8395a..2593bd91d 100644 --- a/app/components/createRegistry/createregistry.html +++ b/app/components/createRegistry/createregistry.html @@ -107,9 +107,9 @@
-
diff --git a/app/components/createSecret/createSecretController.js b/app/components/createSecret/createSecretController.js index 5e0030287..de81a7bc3 100644 --- a/app/components/createSecret/createSecretController.js +++ b/app/components/createSecret/createSecretController.js @@ -12,7 +12,7 @@ function ($scope, $state, Notifications, SecretService, LabelHelper, Authenticat $scope.state = { formValidationError: '', - deploymentInProgress: false + actionInProgress: false }; $scope.addLabel = function() { @@ -65,7 +65,7 @@ function ($scope, $state, Notifications, SecretService, LabelHelper, Authenticat return; } - $scope.state.deploymentInProgress = true; + $scope.state.actionInProgress = true; var secretConfiguration = prepareConfiguration(); SecretService.create(secretConfiguration) .then(function success(data) { @@ -81,7 +81,7 @@ function ($scope, $state, Notifications, SecretService, LabelHelper, Authenticat Notifications.error('Failure', err, 'Unable to create secret'); }) .finally(function final() { - $scope.state.deploymentInProgress = false; + $scope.state.actionInProgress = false; }); }; }]); diff --git a/app/components/createSecret/createsecret.html b/app/components/createSecret/createsecret.html index 46531fb0e..060259958 100644 --- a/app/components/createSecret/createsecret.html +++ b/app/components/createSecret/createsecret.html @@ -75,9 +75,9 @@
- {{ state.formValidationError }}
diff --git a/app/components/createService/createServiceController.js b/app/components/createService/createServiceController.js index 6a874fb85..24f8a7e0e 100644 --- a/app/components/createService/createServiceController.js +++ b/app/components/createService/createServiceController.js @@ -40,7 +40,7 @@ function ($q, $scope, $state, $timeout, Service, ServiceHelper, ConfigService, C $scope.state = { formValidationError: '', - deploymentInProgress: false + actionInProgress: false }; $scope.refreshSlider = function () { @@ -367,7 +367,7 @@ function ($q, $scope, $state, $timeout, Service, ServiceHelper, ConfigService, C Notifications.error('Failure', err, 'Unable to create service'); }) .finally(function final() { - $scope.state.deploymentInProgress = false; + $scope.state.actionInProgress = false; }); } @@ -393,7 +393,7 @@ function ($q, $scope, $state, $timeout, Service, ServiceHelper, ConfigService, C return; } - $scope.state.deploymentInProgress = true; + $scope.state.actionInProgress = true; var config = prepareConfiguration(); createNewService(config, accessControlData); }; diff --git a/app/components/createService/createservice.html b/app/components/createService/createservice.html index a80636d6e..e89dd5a07 100644 --- a/app/components/createService/createservice.html +++ b/app/components/createService/createservice.html @@ -107,9 +107,9 @@
- {{ state.formValidationError }}
diff --git a/app/components/createStack/createStackController.js b/app/components/createStack/createStackController.js index 96b40722a..04f487490 100644 --- a/app/components/createStack/createStackController.js +++ b/app/components/createStack/createStackController.js @@ -19,7 +19,7 @@ function ($scope, $state, $document, StackService, CodeMirrorService, Authentica $scope.state = { Method: 'editor', formValidationError: '', - deploymentInProgress: false + actionInProgress: false }; $scope.addEnvironmentVariable = function() { @@ -74,7 +74,7 @@ function ($scope, $state, $document, StackService, CodeMirrorService, Authentica return; } - $scope.state.deploymentInProgress = true; + $scope.state.actionInProgress = true; createStack(name) .then(function success(data) { Notifications.success('Stack successfully deployed'); @@ -92,7 +92,7 @@ function ($scope, $state, $document, StackService, CodeMirrorService, Authentica Notifications.error('Failure', err, 'Unable to apply resource control on the stack'); }) .finally(function final() { - $scope.state.deploymentInProgress = false; + $scope.state.actionInProgress = false; }); }; diff --git a/app/components/createStack/createstack.html b/app/components/createStack/createstack.html index 3f8db82cf..adc57f796 100644 --- a/app/components/createStack/createstack.html +++ b/app/components/createStack/createstack.html @@ -167,12 +167,12 @@
- {{ state.formValidationError }}
diff --git a/app/components/createVolume/createVolumeController.js b/app/components/createVolume/createVolumeController.js index e71a007ba..bffdf874e 100644 --- a/app/components/createVolume/createVolumeController.js +++ b/app/components/createVolume/createVolumeController.js @@ -10,7 +10,7 @@ function ($q, $scope, $state, VolumeService, PluginService, ResourceControlServi $scope.state = { formValidationError: '', - deploymentInProgress: false + actionInProgress: false }; $scope.availableVolumeDrivers = []; @@ -49,7 +49,7 @@ function ($q, $scope, $state, VolumeService, PluginService, ResourceControlServi return; } - $scope.state.deploymentInProgress = true; + $scope.state.actionInProgress = true; VolumeService.createVolume(volumeConfiguration) .then(function success(data) { var volumeIdentifier = data.Id; @@ -64,7 +64,7 @@ function ($q, $scope, $state, VolumeService, PluginService, ResourceControlServi Notifications.error('Failure', err, 'An error occured during volume creation'); }) .finally(function final() { - $scope.state.deploymentInProgress = false; + $scope.state.actionInProgress = false; }); }; diff --git a/app/components/createVolume/createvolume.html b/app/components/createVolume/createvolume.html index 1a0825ba7..6610f24fe 100644 --- a/app/components/createVolume/createvolume.html +++ b/app/components/createVolume/createvolume.html @@ -71,9 +71,9 @@
- {{ state.formValidationError }}
diff --git a/app/components/endpoint/endpoint.html b/app/components/endpoint/endpoint.html index 860418f12..76f1188bd 100644 --- a/app/components/endpoint/endpoint.html +++ b/app/components/endpoint/endpoint.html @@ -53,9 +53,9 @@
- Cancel
diff --git a/app/components/endpoint/endpointController.js b/app/components/endpoint/endpointController.js index 2094150b5..63316489b 100644 --- a/app/components/endpoint/endpointController.js +++ b/app/components/endpoint/endpointController.js @@ -8,7 +8,7 @@ function ($scope, $state, $transition$, $filter, EndpointService, Notifications) $scope.state = { uploadInProgress: false, - deploymentInProgress: false + actionInProgress: false }; $scope.formValues = { @@ -36,14 +36,14 @@ function ($scope, $state, $transition$, $filter, EndpointService, Notifications) type: $scope.endpointType }; - $scope.state.deploymentInProgress = true; + $scope.state.actionInProgress = true; EndpointService.updateEndpoint(endpoint.Id, endpointParams) .then(function success(data) { Notifications.success('Endpoint updated', $scope.endpoint.Name); $state.go('endpoints'); }, function error(err) { Notifications.error('Failure', err, 'Unable to update endpoint'); - $scope.state.deploymentInProgress = false; + $scope.state.actionInProgress = false; }, function update(evt) { if (evt.upload) { $scope.state.uploadInProgress = evt.upload; diff --git a/app/components/endpoints/endpoints.html b/app/components/endpoints/endpoints.html index 1c74e876c..5f9f0a183 100644 --- a/app/components/endpoints/endpoints.html +++ b/app/components/endpoints/endpoints.html @@ -65,9 +65,9 @@
-
diff --git a/app/components/endpoints/endpointsController.js b/app/components/endpoints/endpointsController.js index 2843c1649..8a33f34b4 100644 --- a/app/components/endpoints/endpointsController.js +++ b/app/components/endpoints/endpointsController.js @@ -5,7 +5,7 @@ function ($scope, $state, $filter, EndpointService, EndpointProvider, Notificati uploadInProgress: false, selectedItemCount: 0, pagination_count: Pagination.getPaginationCount('endpoints'), - deploymentInProgress: false + actionInProgress: false }; $scope.sortType = 'Name'; $scope.sortReverse = true; @@ -60,13 +60,13 @@ function ($scope, $state, $filter, EndpointService, EndpointProvider, Notificati var TLSCertFile = TLSSkipClientVerify ? null : securityData.TLSCert; var TLSKeyFile = TLSSkipClientVerify ? null : securityData.TLSKey; - $scope.state.deploymentInProgress = true; + $scope.state.actionInProgress = true; EndpointService.createRemoteEndpoint(name, URL, PublicURL, TLS, TLSSkipVerify, TLSSkipClientVerify, TLSCAFile, TLSCertFile, TLSKeyFile).then(function success(data) { Notifications.success('Endpoint created', name); $state.reload(); }, function error(err) { $scope.state.uploadInProgress = false; - $scope.state.deploymentInProgress = false; + $scope.state.actionInProgress = false; Notifications.error('Failure', err, 'Unable to create endpoint'); }, function update(evt) { if (evt.upload) { diff --git a/app/components/images/images.html b/app/components/images/images.html index bedf5cab8..acafa7ae0 100644 --- a/app/components/images/images.html +++ b/app/components/images/images.html @@ -28,9 +28,9 @@
-
diff --git a/app/components/images/imagesController.js b/app/components/images/imagesController.js index 0a76b343e..496393a50 100644 --- a/app/components/images/imagesController.js +++ b/app/components/images/imagesController.js @@ -3,7 +3,7 @@ angular.module('images', []) function ($scope, $state, ImageService, Notifications, Pagination, ModalService) { $scope.state = { pagination_count: Pagination.getPaginationCount('images'), - deploymentInProgress: false, + actionInProgress: false, selectedItemCount: 0 }; @@ -45,7 +45,7 @@ function ($scope, $state, ImageService, Notifications, Pagination, ModalService) var image = $scope.formValues.Image; var registry = $scope.formValues.Registry; - $scope.state.deploymentInProgress = true; + $scope.state.actionInProgress = true; ImageService.pullImage(image, registry, false) .then(function success(data) { Notifications.success('Image successfully pulled', image); @@ -55,7 +55,7 @@ function ($scope, $state, ImageService, Notifications, Pagination, ModalService) Notifications.error('Failure', err, 'Unable to pull image'); }) .finally(function final() { - $scope.state.deploymentInProgress = false; + $scope.state.actionInProgress = false; }); }; diff --git a/app/components/initAdmin/initAdmin.html b/app/components/initAdmin/initAdmin.html index 1cff49755..2a8bd59ae 100644 --- a/app/components/initAdmin/initAdmin.html +++ b/app/components/initAdmin/initAdmin.html @@ -64,9 +64,9 @@
-
diff --git a/app/components/initAdmin/initAdminController.js b/app/components/initAdmin/initAdminController.js index 4e22f9e9d..0b0bcfee7 100644 --- a/app/components/initAdmin/initAdminController.js +++ b/app/components/initAdmin/initAdminController.js @@ -11,14 +11,14 @@ function ($scope, $state, $sanitize, Notifications, Authentication, StateManager }; $scope.state = { - deploymentInProgress: false + actionInProgress: false }; $scope.createAdminUser = function() { var username = $sanitize($scope.formValues.Username); var password = $sanitize($scope.formValues.Password); - $scope.state.deploymentInProgress = true; + $scope.state.actionInProgress = true; UserService.initAdministrator(username, password) .then(function success() { return Authentication.login(username, password); @@ -45,7 +45,7 @@ function ($scope, $state, $sanitize, Notifications, Authentication, StateManager Notifications.error('Failure', err, 'Unable to create administrator user'); }) .finally(function final() { - $scope.state.deploymentInProgress = false; + $scope.state.actionInProgress = false; }); }; diff --git a/app/components/initEndpoint/initEndpoint.html b/app/components/initEndpoint/initEndpoint.html index 54512ece6..c526d2ec8 100644 --- a/app/components/initEndpoint/initEndpoint.html +++ b/app/components/initEndpoint/initEndpoint.html @@ -66,9 +66,9 @@
-
@@ -186,9 +186,9 @@
-
diff --git a/app/components/initEndpoint/initEndpointController.js b/app/components/initEndpoint/initEndpointController.js index 9837d4193..cbca5c66b 100644 --- a/app/components/initEndpoint/initEndpointController.js +++ b/app/components/initEndpoint/initEndpointController.js @@ -10,7 +10,7 @@ function ($scope, $state, EndpointService, StateManager, EndpointProvider, Notif $scope.state = { uploadInProgress: false, - deploymentInProgress: false + actionInProgress: false }; $scope.formValues = { @@ -30,7 +30,7 @@ function ($scope, $state, EndpointService, StateManager, EndpointProvider, Notif var URL = 'unix:///var/run/docker.sock'; var endpointID = 1; - $scope.state.deploymentInProgress = true; + $scope.state.actionInProgress = true; EndpointService.createLocalEndpoint(name, URL, false, true) .then(function success(data) { endpointID = data.Id; @@ -45,7 +45,7 @@ function ($scope, $state, EndpointService, StateManager, EndpointProvider, Notif EndpointService.deleteEndpoint(endpointID); }) .finally(function final() { - $scope.state.deploymentInProgress = false; + $scope.state.actionInProgress = false; }); }; @@ -61,7 +61,7 @@ function ($scope, $state, EndpointService, StateManager, EndpointProvider, Notif var TLSKeyFile = TLSSKipClientVerify ? null : $scope.formValues.TLSKey; var endpointID = 1; - $scope.state.deploymentInProgress = true; + $scope.state.actionInProgress = true; EndpointService.createRemoteEndpoint(name, URL, PublicURL, TLS, TLSSkipVerify, TLSSKipClientVerify, TLSCAFile, TLSCertFile, TLSKeyFile) .then(function success(data) { endpointID = data.Id; @@ -76,7 +76,7 @@ function ($scope, $state, EndpointService, StateManager, EndpointProvider, Notif EndpointService.deleteEndpoint(endpointID); }) .finally(function final() { - $scope.state.deploymentInProgress = false; + $scope.state.actionInProgress = false; }); }; }]); diff --git a/app/components/registries/registries.html b/app/components/registries/registries.html index 4eba3201e..e350b83a3 100644 --- a/app/components/registries/registries.html +++ b/app/components/registries/registries.html @@ -56,9 +56,9 @@
-
diff --git a/app/components/registries/registriesController.js b/app/components/registries/registriesController.js index fb3205198..4357cf972 100644 --- a/app/components/registries/registriesController.js +++ b/app/components/registries/registriesController.js @@ -5,14 +5,14 @@ function ($q, $scope, $state, RegistryService, DockerHubService, ModalService, N $scope.state = { selectedItemCount: 0, pagination_count: Pagination.getPaginationCount('registries'), - deploymentInProgress: false + actionInProgress: false }; $scope.sortType = 'Name'; $scope.sortReverse = true; $scope.updateDockerHub = function() { var dockerhub = $scope.dockerhub; - $scope.state.deploymentInProgress = true; + $scope.state.actionInProgress = true; DockerHubService.update(dockerhub) .then(function success(data) { Notifications.success('DockerHub registry updated'); @@ -21,7 +21,7 @@ function ($q, $scope, $state, RegistryService, DockerHubService, ModalService, N Notifications.error('Failure', err, 'Unable to update DockerHub details'); }) .finally(function final() { - $scope.state.deploymentInProgress = false; + $scope.state.actionInProgress = false; }); }; diff --git a/app/components/registry/registry.html b/app/components/registry/registry.html index 829344dab..1cb8002d8 100644 --- a/app/components/registry/registry.html +++ b/app/components/registry/registry.html @@ -64,9 +64,9 @@
- Cancel
diff --git a/app/components/registry/registryController.js b/app/components/registry/registryController.js index efc107ef6..03b672320 100644 --- a/app/components/registry/registryController.js +++ b/app/components/registry/registryController.js @@ -3,12 +3,12 @@ angular.module('registry', []) function ($scope, $state, $transition$, $filter, RegistryService, Notifications) { $scope.state = { - deploymentInProgress: false + actionInProgress: false }; $scope.updateRegistry = function() { var registry = $scope.registry; - $scope.state.deploymentInProgress = true; + $scope.state.actionInProgress = true; RegistryService.updateRegistry(registry) .then(function success(data) { Notifications.success('Registry successfully updated'); @@ -18,7 +18,7 @@ function ($scope, $state, $transition$, $filter, RegistryService, Notifications) Notifications.error('Failure', err, 'Unable to update registry'); }) .finally(function final() { - $scope.state.deploymentInProgress = false; + $scope.state.actionInProgress = false; }); }; diff --git a/app/components/settings/settings.html b/app/components/settings/settings.html index 2e0449022..1cc2e712b 100644 --- a/app/components/settings/settings.html +++ b/app/components/settings/settings.html @@ -110,9 +110,9 @@
-
diff --git a/app/components/settings/settingsController.js b/app/components/settings/settingsController.js index abe9fef57..ef177641b 100644 --- a/app/components/settings/settingsController.js +++ b/app/components/settings/settingsController.js @@ -3,7 +3,7 @@ angular.module('settings', []) function ($scope, $state, Notifications, SettingsService, StateManager, DEFAULT_TEMPLATES_URL) { $scope.state = { - deploymentInProgress: false + actionInProgress: false }; $scope.formValues = { @@ -49,7 +49,7 @@ function ($scope, $state, Notifications, SettingsService, StateManager, DEFAULT_ settings.AllowBindMountsForRegularUsers = !$scope.formValues.restrictBindMounts; settings.AllowPrivilegedModeForRegularUsers = !$scope.formValues.restrictPrivilegedMode; - $scope.state.deploymentInProgress = true; + $scope.state.actionInProgress = true; updateSettings(settings, false); }; @@ -72,7 +72,7 @@ function ($scope, $state, Notifications, SettingsService, StateManager, DEFAULT_ Notifications.error('Failure', err, 'Unable to update settings'); }) .finally(function final() { - $scope.state.deploymentInProgress = false; + $scope.state.actionInProgress = false; }); } diff --git a/app/components/settingsAuthentication/settingsAuthentication.html b/app/components/settingsAuthentication/settingsAuthentication.html index 07e3ec491..b1a4917cf 100644 --- a/app/components/settingsAuthentication/settingsAuthentication.html +++ b/app/components/settingsAuthentication/settingsAuthentication.html @@ -240,9 +240,9 @@
-
diff --git a/app/components/settingsAuthentication/settingsAuthenticationController.js b/app/components/settingsAuthentication/settingsAuthenticationController.js index a52ed8049..36c266dc7 100644 --- a/app/components/settingsAuthentication/settingsAuthenticationController.js +++ b/app/components/settingsAuthentication/settingsAuthenticationController.js @@ -7,7 +7,7 @@ function ($q, $scope, Notifications, SettingsService, FileUploadService) { failedConnectivityCheck: false, uploadInProgress: false, connectivityCheckInProgress: false, - deploymentInProgress: false + actionInProgress: false }; $scope.formValues = { @@ -57,7 +57,7 @@ function ($q, $scope, Notifications, SettingsService, FileUploadService) { var uploadRequired = ($scope.LDAPSettings.TLSConfig.TLS || $scope.LDAPSettings.StartTLS) && !$scope.LDAPSettings.TLSConfig.TLSSkipVerify; $scope.state.uploadInProgress = uploadRequired; - $scope.state.deploymentInProgress = true; + $scope.state.actionInProgress = true; $q.when(!uploadRequired || FileUploadService.uploadLDAPTLSFiles(TLSCAFile, null, null)) .then(function success(data) { return SettingsService.update(settings); @@ -70,7 +70,7 @@ function ($q, $scope, Notifications, SettingsService, FileUploadService) { }) .finally(function final() { $scope.state.uploadInProgress = false; - $scope.state.deploymentInProgress = false; + $scope.state.actionInProgress = false; }); }; diff --git a/app/components/stack/stack.html b/app/components/stack/stack.html index f09031292..07561503e 100644 --- a/app/components/stack/stack.html +++ b/app/components/stack/stack.html @@ -72,9 +72,9 @@
-
diff --git a/app/components/stack/stackController.js b/app/components/stack/stackController.js index 198a00cc0..63efdfeeb 100644 --- a/app/components/stack/stackController.js +++ b/app/components/stack/stackController.js @@ -3,7 +3,7 @@ angular.module('stack', []) function ($q, $scope, $state, $stateParams, $document, StackService, NodeService, ServiceService, TaskService, ServiceHelper, CodeMirrorService, Notifications, FormHelper) { $scope.state = { - deploymentInProgress: false + actionInProgress: false }; $scope.deployStack = function () { @@ -12,7 +12,7 @@ function ($q, $scope, $state, $stateParams, $document, StackService, NodeService var stackFile = $scope.editor.getValue(); var env = FormHelper.removeInvalidEnvVars($scope.stack.Env); - $scope.state.deploymentInProgress = true; + $scope.state.actionInProgress = true; StackService.updateStack($scope.stack.Id, stackFile, env) .then(function success(data) { Notifications.success('Stack successfully deployed'); @@ -22,7 +22,7 @@ function ($q, $scope, $state, $stateParams, $document, StackService, NodeService Notifications.error('Failure', err, 'Unable to create stack'); }) .finally(function final() { - $scope.state.deploymentInProgress = false; + $scope.state.actionInProgress = false; }); }; diff --git a/app/components/teams/teams.html b/app/components/teams/teams.html index c6c7b9657..3b9c47037 100644 --- a/app/components/teams/teams.html +++ b/app/components/teams/teams.html @@ -49,9 +49,9 @@
- {{ state.teamCreationError }} diff --git a/app/components/teams/teamsController.js b/app/components/teams/teamsController.js index 267a4f0a0..41c0e1288 100644 --- a/app/components/teams/teamsController.js +++ b/app/components/teams/teamsController.js @@ -6,7 +6,7 @@ function ($q, $scope, $state, TeamService, UserService, TeamMembershipService, M selectedItemCount: 0, validName: false, pagination_count: Pagination.getPaginationCount('teams'), - deploymentInProgress: false + actionInProgress: false }; $scope.sortType = 'Name'; $scope.sortReverse = false; @@ -55,7 +55,7 @@ function ($q, $scope, $state, TeamService, UserService, TeamMembershipService, M }; $scope.addTeam = function() { - $scope.state.deploymentInProgress = true; + $scope.state.actionInProgress = true; $scope.state.teamCreationError = ''; var teamName = $scope.formValues.Name; var leaderIds = []; @@ -72,7 +72,7 @@ function ($q, $scope, $state, TeamService, UserService, TeamMembershipService, M Notifications.error('Failure', err, 'Unable to create team'); }) .finally(function final() { - $scope.state.deploymentInProgress = false; + $scope.state.actionInProgress = false; }); }; diff --git a/app/components/templates/templates.html b/app/components/templates/templates.html index 274173635..633e9cf92 100644 --- a/app/components/templates/templates.html +++ b/app/components/templates/templates.html @@ -64,9 +64,9 @@
- {{ state.formValidationError }}
@@ -296,9 +296,9 @@
- When using Swarm, we recommend deploying containers in a shared network. Looks like you don't have any shared network, head over the networks view to create one. diff --git a/app/components/templates/templatesController.js b/app/components/templates/templatesController.js index d8e9f2234..c6610886e 100644 --- a/app/components/templates/templatesController.js +++ b/app/components/templates/templatesController.js @@ -7,7 +7,7 @@ function ($scope, $q, $state, $transition$, $anchorScroll, $filter, ContainerSer hideDescriptions: $transition$.params().hide_descriptions, formValidationError: '', showDeploymentSelector: false, - deploymentInProgress: false, + actionInProgress: false, filters: { Categories: '!', Platform: '!', @@ -86,7 +86,7 @@ function ($scope, $q, $state, $transition$, $anchorScroll, $filter, ContainerSer Notifications.error('Failure', err, err.msg); }) .finally(function final() { - $scope.state.deploymentInProgress = false; + $scope.state.actionInProgress = false; }); } @@ -114,7 +114,7 @@ function ($scope, $q, $state, $transition$, $anchorScroll, $filter, ContainerSer $state.go('stacks', {}, {reload: true}); }) .finally(function final() { - $scope.state.deploymentInProgress = false; + $scope.state.actionInProgress = false; }); } @@ -131,7 +131,7 @@ function ($scope, $q, $state, $transition$, $anchorScroll, $filter, ContainerSer var template = $scope.state.selectedTemplate; var templatesKey = $scope.templatesKey; - $scope.state.deploymentInProgress = true; + $scope.state.actionInProgress = true; if (template.Type === 'stack') { createStackFromTemplate(template, userId, accessControlData); } else { diff --git a/app/components/users/users.html b/app/components/users/users.html index 8cb96e493..c11f56d30 100644 --- a/app/components/users/users.html +++ b/app/components/users/users.html @@ -97,9 +97,9 @@
- {{ state.userCreationError }} diff --git a/app/components/users/usersController.js b/app/components/users/usersController.js index d4b11151f..61159f62c 100644 --- a/app/components/users/usersController.js +++ b/app/components/users/usersController.js @@ -6,7 +6,7 @@ function ($q, $scope, $state, $sanitize, UserService, TeamService, TeamMembershi selectedItemCount: 0, validUsername: false, pagination_count: Pagination.getPaginationCount('users'), - deploymentInProgress: false + actionInProgress: false }; $scope.sortType = 'RoleName'; $scope.sortReverse = false; @@ -58,7 +58,7 @@ function ($q, $scope, $state, $sanitize, UserService, TeamService, TeamMembershi }; $scope.addUser = function() { - $scope.state.deploymentInProgress = true; + $scope.state.actionInProgress = true; $scope.state.userCreationError = ''; var username = $sanitize($scope.formValues.Username); var password = $sanitize($scope.formValues.Password); @@ -76,7 +76,7 @@ function ($q, $scope, $state, $sanitize, UserService, TeamService, TeamMembershi Notifications.error('Failure', err, 'Unable to create user'); }) .finally(function final() { - $scope.state.deploymentInProgress = false; + $scope.state.actionInProgress = false; }); };