github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(stacks): fix an issue when deploying public stacks

pull/1755/head
Anthony Lapenna 2018-03-22 15:38:00 +10:00
parent bca8936faa
commit c267f8bf57
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/docker/views/stacks/create/createStackController.js
View File

@ -83,14 +83,11 @@ function ($scope, $state, StackService, Authentication, Notifications, FormValid
$scope.state.actionInProgress = true; $scope.state.actionInProgress = true;
createStack(name, method) createStack(name, method)
.then(function success(data) { .then(function success(data) {
Notifications.success('Stack successfully deployed'); return ResourceControlService.applyResourceControl('stack', name, userId, accessControlData, []);
return ResourceControlService.applyResourceControl('stack', name, userId, accessControlData, [])
.then(function success() {
$state.go('docker.stacks');
}) })
.catch(function error(err) { .then(function success() {
Notifications.error('Failure', err, 'Unable to apply resource control on the stack'); Notifications.success('Stack successfully deployed');
}); $state.go('docker.stacks');
}) })
.catch(function error(err) { .catch(function error(err) {
Notifications.warning('Deployment error', err.err.data.err); Notifications.warning('Deployment error', err.err.data.err);

11
app/docker/views/templates/templatesController.js
View File

@ -115,14 +115,11 @@ function ($scope, $q, $state, $transition$, $anchorScroll, $filter, ContainerSer
StackService.createStackFromGitRepository(stackName, repositoryOptions, template.Env) StackService.createStackFromGitRepository(stackName, repositoryOptions, template.Env)
.then(function success(data) { .then(function success(data) {
Notifications.success('Stack successfully deployed'); return ResourceControlService.applyResourceControl('stack', stackName, userId, accessControlData, []);
ResourceControlService.applyResourceControl('stack', stackName, userId, accessControlData, [])
.then(function success() {
$state.go('docker.stacks');
}) })
.catch(function error(err) { .then(function success() {
Notifications.error('Failure', err, 'Unable to apply resource control on the stack'); Notifications.success('Stack successfully deployed');
}); $state.go('docker.stacks');
}) })
.catch(function error(err) { .catch(function error(err) {
Notifications.warning('Deployment error', err.err.data.err); Notifications.warning('Deployment error', err.err.data.err);