Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-09 07:45:22 +02:00
Code Issues Releases Activity

feat(stack): make stack created from app template editable EE-1941 (#6104)

Browse source 
feat(stack): make stack from app template editable
This commit is contained in:
Hao Zhang 2021-12-07 19:46:58 +08:00 • committed by GitHub
parent 0627e16b35
commit 9f5ac154aa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 39 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/portainer/models/stack.js
View file

@ -21,6 +21,7 @@ export function StackViewModel(data) {
this.Orphaned = false;
this.Checked = false;
this.GitConfig = data.GitConfig;
this.FromAppTemplate = data.FromAppTemplate;
this.AdditionalFiles = data.AdditionalFiles;
this.AutoUpdate = data.AutoUpdate;
}

2
app/portainer/services/api/stackService.js
View file

@ -363,6 +363,7 @@ angular.module('portainer.app').factory('StackService', [
RepositoryUsername: repositoryOptions.RepositoryUsername,
RepositoryPassword: repositoryOptions.RepositoryPassword,
Env: env,
FromAppTemplate: repositoryOptions.FromAppTemplate,
};
if (repositoryOptions.AutoUpdate) {
@ -389,6 +390,7 @@ angular.module('portainer.app').factory('StackService', [
RepositoryUsername: repositoryOptions.RepositoryUsername,
RepositoryPassword: repositoryOptions.RepositoryPassword,
Env: env,
FromAppTemplate: repositoryOptions.FromAppTemplate,
};
if (repositoryOptions.AutoUpdate) {

5
app/portainer/views/stacks/edit/stack.html
View file

@ -110,7 +110,8 @@
</div>
<!-- !associate -->
<stack-redeploy-git-form ng-if="stack.GitConfig" model="stack.GitConfig" stack="stack" authorization="PortainerStackUpdate"> </stack-redeploy-git-form>
<stack-redeploy-git-form ng-if="stack.GitConfig && !stack.FromAppTemplate" model="stack.GitConfig" stack="stack" authorization="PortainerStackUpdate">
</stack-redeploy-git-form>
<stack-duplication-form
ng-if="regular && endpoints.length > 0"
endpoints="endpoints"
@ -125,7 +126,7 @@
</uib-tab>
<!-- !tab-info -->
<!-- tab-file -->
<uib-tab index="1" select="showEditor()" ng-if="!external && !stack.GitConfig">
<uib-tab index="1" select="showEditor()" ng-if="!external && (!stack.GitConfig || stack.FromAppTemplate)">
<uib-tab-heading> <i class="fa fa-pencil-alt space-right" aria-hidden="true"></i> Editor </uib-tab-heading>
<form class="form-horizontal" ng-if="state.showEditorTab" style="margin-top: 10px;" name="stackUpdateForm">
<div class="form-group">

2
app/portainer/views/templates/templatesController.js
View file

@ -141,6 +141,7 @@ angular.module('portainer.app').controller('TemplatesController', [
var repositoryOptions = {
RepositoryURL: template.Repository.url,
ComposeFilePathInRepository: template.Repository.stackfile,
FromAppTemplate: true,
};
const endpointId = +$state.params.endpointId;
@ -178,6 +179,7 @@ angular.module('portainer.app').controller('TemplatesController', [
var repositoryOptions = {
RepositoryURL: template.Repository.url,
ComposeFilePathInRepository: template.Repository.stackfile,
FromAppTemplate: true,
};
const endpointId = +$state.params.endpointId;