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

fix(git): EE-4577 Git Repository Fields are Missing in Edge Stacks (#8057)

pull/8065/head^2
cmeng 2022-11-18 08:59:58 +13:00 committed by GitHub
parent d012a4efc4
commit 4cfa584c7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/edge/views/edge-stacks/createEdgeStackView/docker-compose-form/docker-compose-form.html
View File

@ -21,7 +21,7 @@
<file-upload-description> You can upload a Compose file from your computer. </file-upload-description> <file-upload-description> You can upload a Compose file from your computer. </file-upload-description>
</file-upload-form> </file-upload-form>
<git-form ng-if="$ctrl.state.Method === 'repository'" model="$ctrl.formValues" on-change="($ctrl.onChangeFormValues)"></git-form> <git-form ng-if="$ctrl.state.Method === 'repository'" model="$ctrl.formValues" on-change="($ctrl.onChangeFormValues)" hide-rebuild-info="true"></git-form>
<!-- template --> <!-- template -->
<div ng-if="$ctrl.state.Method === 'template'"> <div ng-if="$ctrl.state.Method === 'template'">

8
app/edge/views/edge-stacks/createEdgeStackView/kube-manifest-form/kube-manifest-form.html
View File

@ -21,4 +21,10 @@
</file-upload-description> </file-upload-description>
</file-upload-form> </file-upload-form>
<git-form ng-if="$ctrl.state.Method === 'repository'" deploy-method="kubernetes" model="$ctrl.formValues" on-change="($ctrl.onChangeFormValues)"></git-form> <git-form
ng-if="$ctrl.state.Method === 'repository'"
deploy-method="kubernetes"
model="$ctrl.formValues"
on-change="($ctrl.onChangeFormValues)"
hide-rebuild-info="true"
></git-form>

4
app/portainer/components/forms/git-form/git-form.controller.js
View File

@ -1,11 +1,12 @@
export default class GitFormController { export default class GitFormController {
/* @ngInject */ /* @ngInject */
constructor(StateManager) { constructor(StateManager) {
this.StateManager = StateManager;
this.onChangeField = this.onChangeField.bind(this); this.onChangeField = this.onChangeField.bind(this);
this.onChangeURL = this.onChangeField('RepositoryURL'); this.onChangeURL = this.onChangeField('RepositoryURL');
this.onChangeRefName = this.onChangeField('RepositoryReferenceName'); this.onChangeRefName = this.onChangeField('RepositoryReferenceName');
this.onChangeComposePath = this.onChangeField('ComposeFilePathInRepository'); this.onChangeComposePath = this.onChangeField('ComposeFilePathInRepository');
this.isDockerStandalone = StateManager.getState().endpoint.mode.provider === 'DOCKER_STANDALONE';
} }
onChangeField(field) { onChangeField(field) {
@ -19,5 +20,6 @@ export default class GitFormController {
$onInit() { $onInit() {
this.deployMethod = this.deployMethod || 'compose'; this.deployMethod = this.deployMethod || 'compose';
this.isDockerStandalone = !this.hideRebuildInfo && this.StateManager.getState().endpoint.mode.provider === 'DOCKER_STANDALONE';
} }
} }

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

@ -11,5 +11,6 @@ export const gitForm = {
autoUpdate: '<', autoUpdate: '<',
showAuthExplanation: '<', showAuthExplanation: '<',
showForcePullImage: '<', showForcePullImage: '<',
hideRebuildInfo: '@',
}, },
}; };