diff --git a/app/docker/views/containers/edit/container.html b/app/docker/views/containers/edit/container.html index 52076b7e6..d878f3a67 100644 --- a/app/docker/views/containers/edit/container.html +++ b/app/docker/views/containers/edit/container.html @@ -190,7 +190,16 @@ - +
@@ -201,7 +210,14 @@
- +
diff --git a/app/docker/views/containers/edit/containerController.js b/app/docker/views/containers/edit/containerController.js index c828853f0..6cededbe0 100644 --- a/app/docker/views/containers/edit/containerController.js +++ b/app/docker/views/containers/edit/containerController.js @@ -44,6 +44,7 @@ angular.module('portainer.docker').controller('ContainerController', [ endpoint ) { $scope.endpoint = endpoint; + $scope.isAdmin = Authentication.isAdmin(); $scope.activityTime = 0; $scope.portBindings = []; $scope.displayRecreateButton = false; @@ -57,8 +58,14 @@ angular.module('portainer.docker').controller('ContainerController', [ recreateContainerInProgress: false, joinNetworkInProgress: false, leaveNetworkInProgress: false, + pullImageValidity: false, }; + $scope.setPullImageValidity = setPullImageValidity; + function setPullImageValidity(validity) { + $scope.state.pullImageValidity = validity; + } + $scope.updateRestartPolicy = updateRestartPolicy; var update = function () { diff --git a/app/docker/views/images/edit/image.html b/app/docker/views/images/edit/image.html index e117000c5..ebe41e5dc 100644 --- a/app/docker/views/images/edit/image.html +++ b/app/docker/views/images/edit/image.html @@ -63,7 +63,15 @@
- +
@@ -74,7 +82,7 @@
- +
diff --git a/app/docker/views/images/edit/imageController.js b/app/docker/views/images/edit/imageController.js index e7408de7d..e13f2e8d1 100644 --- a/app/docker/views/images/edit/imageController.js +++ b/app/docker/views/images/edit/imageController.js @@ -7,7 +7,7 @@ angular.module('portainer.docker').controller('ImageController', [ '$scope', '$transition$', '$state', - 'endpoint', + 'Authentication', 'ImageService', 'ImageHelper', 'RegistryService', @@ -16,14 +16,34 @@ angular.module('portainer.docker').controller('ImageController', [ 'ModalService', 'FileSaver', 'Blob', - function ($async, $q, $scope, $transition$, $state, endpoint, ImageService, ImageHelper, RegistryService, Notifications, HttpRequestHelper, ModalService, FileSaver, Blob) { + 'endpoint', + function ( + $async, + $q, + $scope, + $transition$, + $state, + Authentication, + ImageService, + ImageHelper, + RegistryService, + Notifications, + HttpRequestHelper, + ModalService, + FileSaver, + Blob, + endpoint + ) { $scope.endpoint = endpoint; + $scope.isAdmin = Authentication.isAdmin(); + $scope.formValues = { RegistryModel: new PorImageRegistryModel(), }; $scope.state = { exportInProgress: false, + pullImageValidity: false, }; $scope.sortType = 'Order'; @@ -40,6 +60,11 @@ angular.module('portainer.docker').controller('ImageController', [ $('#layer-command-' + layerId + '-full').toggle(); }; + $scope.setPullImageValidity = setPullImageValidity; + function setPullImageValidity(validity) { + $scope.state.pullImageValidity = validity; + } + $scope.tagImage = function () { const registryModel = $scope.formValues.RegistryModel;