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

fix(edge) EE-1733 cant edit edge groups (#5687) 

* fix(edge) EE-1733 cant edit edge groups

* fix(edge) EE-1733 correct json names of a few edge objects

Co-authored-by: Simon Meng <simon.meng@portainer.io>
pull/5696/head
cong meng 2021-09-21 17:41:14 +12:00 committed by GitHub
parent 24f11902b2
commit 4267304e50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/portainer.go
View File

@ -148,7 +148,7 @@ type (
Name string `json:"Name"` Name string `json:"Name"`
Dynamic bool `json:"Dynamic"` Dynamic bool `json:"Dynamic"`
TagIDs []TagID `json:"TagIds"` TagIDs []TagID `json:"TagIds"`
Endpoints []EndpointID `json:"Environments"` Endpoints []EndpointID `json:"Endpoints"`
PartialMatch bool `json:"PartialMatch"` PartialMatch bool `json:"PartialMatch"`
} }
@ -161,7 +161,7 @@ type (
ID EdgeJobID `json:"Id" example:"1"` ID EdgeJobID `json:"Id" example:"1"`
Created int64 `json:"Created"` Created int64 `json:"Created"`
CronExpression string `json:"CronExpression"` CronExpression string `json:"CronExpression"`
Endpoints map[EndpointID]EdgeJobEndpointMeta `json:"Environments"` Endpoints map[EndpointID]EdgeJobEndpointMeta `json:"Endpoints"`
Name string `json:"Name"` Name string `json:"Name"`
ScriptPath string `json:"ScriptPath"` ScriptPath string `json:"ScriptPath"`
Recurring bool `json:"Recurring"` Recurring bool `json:"Recurring"`
@ -188,7 +188,7 @@ type (
CronExpression string `json:"CronExpression"` CronExpression string `json:"CronExpression"`
Script string `json:"Script"` Script string `json:"Script"`
Version int `json:"Version"` Version int `json:"Version"`
Endpoints []EndpointID `json:"Environments"` Endpoints []EndpointID `json:"Endpoints"`
} }
//EdgeStack represents an edge stack //EdgeStack represents an edge stack

5
app/edge/views/edge-groups/editEdgeGroupView/editEdgeGroupViewController.js
View File

@ -8,6 +8,11 @@ export class EditEdgeGroupController {
this.$state = $state; this.$state = $state;
this.$async = $async; this.$async = $async;
this.state = {
actionInProgress: false,
loaded: false,
};
this.updateGroup = this.updateGroup.bind(this); this.updateGroup = this.updateGroup.bind(this);
this.updateGroupAsync = this.updateGroupAsync.bind(this); this.updateGroupAsync = this.updateGroupAsync.bind(this);
} }