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

chore(edgegroups): rename decoratedEdgeGroup property EE-5501 (#9212)

pull/9231/head
matias-portainer 2023-07-19 12:28:17 -03:00 committed by GitHub
parent 88da28694c
commit b5c5df798a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/http/handler/edgegroups/edgegroup_list.go
View File

@ -14,7 +14,7 @@ import (
type decoratedEdgeGroup struct { type decoratedEdgeGroup struct {
portainer.EdgeGroup portainer.EdgeGroup
HasEdgeStack bool `json:"HasEdgeStack"` HasEdgeStack bool `json:"HasEdgeStack"`
HasEdgeGroup bool `json:"HasEdgeGroup"` HasEdgeJob bool `json:"HasEdgeJob"`
EndpointTypes []portainer.EndpointType EndpointTypes []portainer.EndpointType
} }
@ -99,7 +99,7 @@ func getEdgeGroupList(tx dataservices.DataStoreTx) ([]decoratedEdgeGroup, error)
edgeGroup.EndpointTypes = endpointTypes edgeGroup.EndpointTypes = endpointTypes
edgeGroup.HasEdgeStack = usedEdgeGroups[edgeGroup.ID] edgeGroup.HasEdgeStack = usedEdgeGroups[edgeGroup.ID]
edgeGroup.HasEdgeGroup = usedByEdgeJob edgeGroup.HasEdgeJob = usedByEdgeJob
decoratedEdgeGroups = append(decoratedEdgeGroups, edgeGroup) decoratedEdgeGroups = append(decoratedEdgeGroups, edgeGroup)
} }

4
app/edge/components/groups-datatable/groupsDatatable.html
View File

@ -78,13 +78,13 @@
id="select_{{ $index }}" id="select_{{ $index }}"
type="checkbox" type="checkbox"
ng-model="item.Checked" ng-model="item.Checked"
ng-disabled="item.HasEdgeStack || item.HasEdgeGroup" ng-disabled="item.HasEdgeStack || item.HasEdgeJob"
ng-click="$ctrl.selectItem(item, $event)" ng-click="$ctrl.selectItem(item, $event)"
/> />
<label for="select_{{ $index }}"></label> <label for="select_{{ $index }}"></label>
</span> </span>
<a ui-sref="edge.groups.edit({groupId: item.Id})">{{ item.Name }}</a> <a ui-sref="edge.groups.edit({groupId: item.Id})">{{ item.Name }}</a>
<span ng-if="item.HasEdgeStack || item.HasEdgeGroup" class="label label-info image-tag space-left">in use</span> <span ng-if="item.HasEdgeStack || item.HasEdgeJob" class="label label-info image-tag space-left">in use</span>
</td> </td>
<td>{{ item.Endpoints.length }}</td> <td>{{ item.Endpoints.length }}</td>
<td>{{ item.Dynamic ? 'Dynamic' : 'Static' }}</td> <td>{{ item.Dynamic ? 'Dynamic' : 'Static' }}</td>