Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-04 13:25:26 +02:00
Code Issues Releases Activity

refactor(docker/switch/component): implement new design [EE-3688] (#7239)

Browse source 
* refactor(docker/switch/component): implement new design [EE=3688]

* revert create volume

* revert por-switch on exec.html

* refactor(container): switch fields on container creation page and edition page

* refactor(container): switch fields on networking/secret/servicewebhook/swarmvisual

* bug fixed

* code review issues

* merge code

* fix teaser for container edition

* fix encode secret toggle bug on adding secret page

* fixed a bug for service webhook toggle
This commit is contained in:
Zhang Hao 2022-07-20 08:39:44 +08:00 • committed by GitHub
parent e07253bcef
commit 43bbeed141
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 194 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/docker/views/containers/edit/container.html
View file

@ -107,17 +107,18 @@
<td>Finished</td>
<td>{{ container.State.FinishedAt | getisodate }}</td>
</tr>
<tr ng-if="isAdmin && displayRecreateButton && applicationState.endpoint.type !== 4">
<td colspan="1">
Container webhook
<portainer-tooltip
position="'top'"
message="'Webhook (or callback URI) used to automate the recreation of this container. Sending a POST request to this callback URI (without requiring any authentication) will pull the most up-to-date version of the associated image and recreate this container.'"
></portainer-tooltip>
<label class="switch box-selector-item limited business" style="margin-left: 20px">
<input disable-authorization="DockerContainerUpdate" type="checkbox" ng-model="WebhookExists" disabled="disabled" ng-checked="false" /><i></i>
</label>
<be-feature-indicator feature="containerWebhookFeature"></be-feature-indicator>
<tr ng-if="isAdmin && displayCreateWebhookButton && applicationState.endpoint.type !== 4">
<td colspan="6">
<div class="form-group">
<div class="col-sm-12">
<por-switch-field
tooltip="'Webhook (or callback URI) used to automate the recreation of this container. Sending a POST request to this callback URI (without requiring any authentication) will pull the most up-to-date version of the associated image and recreate this container.'"
label-class="'col-sm-2'"
label="'Container webhook'"
feature-id="'container-webhook'"
></por-switch-field>
</div>
</div>
</td>
</tr>
<tr authorization="DockerContainerLogs, DockerContainerInspect, DockerContainerStats, DockerExecStart">

2
app/docker/views/containers/edit/containerController.js
View file

@ -52,6 +52,7 @@ angular.module('portainer.docker').controller('ContainerController', [
$scope.activityTime = 0;
$scope.portBindings = [];
$scope.displayRecreateButton = false;
$scope.displayCreateWebhookButton = false;
$scope.containerWebhookFeature = FeatureId.CONTAINER_WEBHOOK;
$scope.config = {
@ -150,6 +151,7 @@ angular.module('portainer.docker').controller('ContainerController', [
!allowPrivilegedModeForRegularUsers;
$scope.displayRecreateButton = !inSwarm && !autoRemove && (admin || !settingRestrictsRegularUsers);
$scope.displayCreateWebhookButton = $scope.displayRecreateButton;
})
.catch(function error(err) {
Notifications.error('Failure', err, 'Unable to retrieve container info');