Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-05 05:45:22 +02:00
Code Issues Releases Activity

refactor(ux): rename deploymentInProgress variable (#1385)

Browse source
This commit is contained in:
Anthony Lapenna 2017-11-12 22:39:12 +01:00 • committed by GitHub
parent d68708add7
commit efc3154617
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
40 changed files with 130 additions and 130 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/components/settingsAuthentication/settingsAuthentication.html
View file

@ -240,9 +240,9 @@
<!-- actions -->
<div class="form-group">
<div class="col-sm-12">
<button type="button" class="btn btn-primary btn-sm" ng-click="saveSettings()" ng-disabled="state.deploymentInProgress" button-spinner="state.deploymentInProgress">
<span ng-hide="state.deploymentInProgress">Save settings</span>
<span ng-show="state.deploymentInProgress">Saving...</span>
<button type="button" class="btn btn-primary btn-sm" ng-click="saveSettings()" ng-disabled="state.actionInProgress" button-spinner="state.actionInProgress">
<span ng-hide="state.actionInProgress">Save settings</span>
<span ng-show="state.actionInProgress">Saving...</span>
</button>
</div>
</div>

6
app/components/settingsAuthentication/settingsAuthenticationController.js
View file

@ -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;
});
};