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

fix(edge/stacks): ignore missing file [EE-5649] (#9127)

pull/9135/head
Chaim Lev-Ari 2023-06-29 13:32:04 +07:00 committed by GitHub
parent f293ea41d3
commit ceabb2884b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/edge/views/edge-stacks/editEdgeStackView/editEdgeStackView.html
View File

@ -12,7 +12,7 @@
<div style="padding: 20px"> <div style="padding: 20px">
<edit-edge-stack-form <edit-edge-stack-form
ng-if="$ctrl.edgeGroups && $ctrl.stack && $ctrl.formValues.content" ng-if="$ctrl.edgeGroups && $ctrl.stack && $ctrl.formValues.content !== null"
edge-groups="$ctrl.edgeGroups" edge-groups="$ctrl.edgeGroups"
edge-stack="$ctrl.stack" edge-stack="$ctrl.stack"
is-submitting="$ctrl.state.actionInProgress" is-submitting="$ctrl.state.actionInProgress"

8
app/edge/views/edge-stacks/editEdgeStackView/editEdgeStackViewController.js
View File

@ -22,7 +22,7 @@ export class EditEdgeStackViewController {
}; };
this.formValues = { this.formValues = {
content: '', content: null,
}; };
this.deployStack = this.deployStack.bind(this); this.deployStack = this.deployStack.bind(this);
@ -36,7 +36,11 @@ export class EditEdgeStackViewController {
const { stackId, tab } = this.$state.params; const { stackId, tab } = this.$state.params;
this.state.activeTab = tab ? parseInt(tab, 10) : 0; this.state.activeTab = tab ? parseInt(tab, 10) : 0;
try { try {
const [edgeGroups, model, file] = await Promise.all([this.EdgeGroupService.groups(), this.EdgeStackService.stack(stackId), this.EdgeStackService.stackFile(stackId)]); const [edgeGroups, model, file] = await Promise.all([
this.EdgeGroupService.groups(),
this.EdgeStackService.stack(stackId),
this.EdgeStackService.stackFile(stackId).catch(() => ''),
]);
this.edgeGroups = edgeGroups; this.edgeGroups = edgeGroups;
this.stack = model; this.stack = model;