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

Merge branch 'crosbymichael-master' into bharat-add-commit 

Conflicts:
	app/components/container/container.html
pull/2/head
Kevan Ahlquist 2015-05-14 01:01:26 -05:00
parent 968efed6c3 4637c5fbbd
commit c0ae0d8d3f
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,6 +40,10 @@
ng-click="unpause()" ng-click="unpause()"
ng-show="container.State.Running && container.State.Paused">Unpause ng-show="container.State.Running && container.State.Paused">Unpause
</button> </button>
<button class="btn btn-success"
ng-click="restart()"
ng-show="container.State.Running && !container.State.Stopped">Restart
</button>
<button class="btn btn-primary" <button class="btn btn-primary"
ng-click="commit()" ng-click="commit()"
ng-show="container.State.Running && !container.State.Paused">Commit ng-show="container.State.Running && !container.State.Paused">Commit

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

@ -101,6 +101,17 @@ function($scope, $routeParams, $location, Container, ContainerCommit, Messages,
}); });
}; };
$scope.restart = function() {
ViewSpinner.spin();
Container.restart({id: $routeParams.id}, function(d) {
update();
Messages.send("Container restarted", $routeParams.id);
}, function(e){
update();
Messages.error("Failure", "Container failed to restart." + e.data);
});
};
$scope.hasContent = function(data) { $scope.hasContent = function(data) {
return data !== null && data !== undefined; return data !== null && data !== undefined;
}; };