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

feat(container-details): display loading when using recreate (#1471)

pull/1377/merge
Anthony Lapenna 2017-12-05 17:46:11 +01:00 committed by GitHub
parent 283faca4f7
commit f3a23c7dd1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/components/container/container.html
View File

@ -21,7 +21,10 @@
<button class="btn btn-danger btn-responsive" ng-click="confirmRemove()"><i class="fa fa-trash space-right" aria-hidden="true"></i>Remove</button> <button class="btn btn-danger btn-responsive" ng-click="confirmRemove()"><i class="fa fa-trash space-right" aria-hidden="true"></i>Remove</button>
</div> </div>
<div class="btn-group" role="group" aria-label="..."> <div class="btn-group" role="group" aria-label="...">
<button class="btn btn-danger btn-responsive" ng-click="recreate()" ng-if="!container.Config.Labels['com.docker.swarm.service.id']"><i class="fa fa-refresh space-right" aria-hidden="true"></i>Recreate</button> <button type="button" class="btn btn-danger btn-responsive" ng-disabled="state.recreateContainerInProgress" ng-click="recreate()" button-spinner="state.recreateContainerInProgress" ng-if="!container.Config.Labels['com.docker.swarm.service.id']">
<span ng-hide="state.recreateContainerInProgress"><i class="fa fa-refresh space-right" aria-hidden="true"></i>Recreate</span>
<span ng-show="state.recreateContainerInProgress">Recreation in progress...</span>
</button>
<button class="btn btn-primary btn-responsive" ng-click="duplicate()" ng-if="!container.Config.Labels['com.docker.swarm.service.id']"><i class="fa fa-files-o space-right" aria-hidden="true"></i>Duplicate/Edit</button> <button class="btn btn-primary btn-responsive" ng-click="duplicate()" ng-if="!container.Config.Labels['com.docker.swarm.service.id']"><i class="fa fa-files-o space-right" aria-hidden="true"></i>Duplicate/Edit</button>
</div> </div>
</rd-widget-body> </rd-widget-body>

3
app/components/container/containerController.js
View File

@ -8,6 +8,7 @@ function ($q, $scope, $state, $transition$, $filter, Container, ContainerCommit,
Registry: '' Registry: ''
}; };
$scope.state = { $scope.state = {
recreateContainerInProgress: false,
joinNetworkInProgress: false, joinNetworkInProgress: false,
leaveNetworkInProgress: false, leaveNetworkInProgress: false,
pagination_count: Pagination.getPaginationCount('container_networks') pagination_count: Pagination.getPaginationCount('container_networks')
@ -207,6 +208,7 @@ function ($q, $scope, $state, $transition$, $filter, Container, ContainerCommit,
function recreateContainer(pullImage) { function recreateContainer(pullImage) {
var container = $scope.container; var container = $scope.container;
var config = ContainerHelper.configFromContainer(container.Model); var config = ContainerHelper.configFromContainer(container.Model);
$scope.state.recreateContainerInProgress = true;
ContainerService.remove(container, true) ContainerService.remove(container, true)
.then(function success() { .then(function success() {
return RegistryService.retrieveRegistryFromRepository(container.Config.Image); return RegistryService.retrieveRegistryFromRepository(container.Config.Image);
@ -239,6 +241,7 @@ function ($q, $scope, $state, $transition$, $filter, Container, ContainerCommit,
}) })
.catch(function error(err) { .catch(function error(err) {
Notifications.error('Failure', err, 'Unable to re-create container'); Notifications.error('Failure', err, 'Unable to re-create container');
$scope.state.recreateContainerInProgress = false;
}); });
} }