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

fix(gitops): show prune option only in the swarm stack (#7190)

pull/7216/head
Oscar Zhou 2022-07-07 11:23:22 +12:00 committed by GitHub
parent ce840997bf
commit 3241738775
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/portainer/components/forms/stack-redeploy-git-form/index.js
View File

@ -7,6 +7,7 @@ export const stackRedeployGitForm = {
bindings: { bindings: {
model: '<', model: '<',
stack: '<', stack: '<',
endpoint: '<',
}, },
}; };

2
app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.html
View File

@ -36,7 +36,7 @@
explanation="These values will be used as substitutions in the stack file" explanation="These values will be used as substitutions in the stack file"
on-change="($ctrl.onChangeEnvVar)" on-change="($ctrl.onChangeEnvVar)"
></environment-variables-panel> ></environment-variables-panel>
<option-panel ng-model="$ctrl.formValues.Option" on-change="($ctrl.onChangeOption)"></option-panel> <option-panel ng-if="$ctrl.stack.Type === 1 && $ctrl.endpoint.apiVersion >= 1.27" ng-model="$ctrl.formValues.Option" on-change="($ctrl.onChangeOption)"></option-panel>
<button <button
class="btn btn-sm btn-primary" class="btn btn-sm btn-primary"
ng-click="$ctrl.submit()" ng-click="$ctrl.submit()"

2
app/portainer/components/option-panel/option-panel.html
View File

@ -6,7 +6,7 @@
<div class="col-sm-12"> <div class="col-sm-12">
<label class="control-label text-left"> <label class="control-label text-left">
Prune services Prune services
<portainer-tooltip position="top" message="Prune services that are no longer referenced."></portainer-tooltip> <portainer-tooltip position="'top'" message="'Prune services that are no longer referenced.'"></portainer-tooltip>
</label> </label>
<label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="$ctrl.ngModel.Prune" ng-change="$ctrl.switchPruneService()" /><i></i> </label> <label class="switch" style="margin-left: 20px"> <input type="checkbox" ng-model="$ctrl.ngModel.Prune" ng-change="$ctrl.switchPruneService()" /><i></i> </label>
</div> </div>

3
app/portainer/views/stacks/edit/stack.html
View File

@ -111,6 +111,7 @@
model="stack.GitConfig" model="stack.GitConfig"
stack="stack" stack="stack"
authorization="PortainerStackUpdate" authorization="PortainerStackUpdate"
endpoint="applicationState.endpoint"
> >
</stack-redeploy-git-form> </stack-redeploy-git-form>
<stack-duplication-form <stack-duplication-form
@ -189,7 +190,7 @@
<div class="col-sm-12"> <div class="col-sm-12">
<label for="prune" class="control-label text-left"> <label for="prune" class="control-label text-left">
Prune services Prune services
<portainer-tooltip message="'Prune services that are no longer referenced.'"></portainer-tooltip> <portainer-tooltip position="'top'" message="'Prune services that are no longer referenced.'"></portainer-tooltip>
</label> </label>
<label class="switch" style="margin-left: 20px"> <input name="prune" type="checkbox" ng-model="formValues.Prune" /><i></i> </label> <label class="switch" style="margin-left: 20px"> <input name="prune" type="checkbox" ng-model="formValues.Prune" /><i></i> </label>
</div> </div>