diff --git a/api/http/handler/edgegroups/edgegroup_list.go b/api/http/handler/edgegroups/edgegroup_list.go index 624be9194..1fea62c4b 100644 --- a/api/http/handler/edgegroups/edgegroup_list.go +++ b/api/http/handler/edgegroups/edgegroup_list.go @@ -14,7 +14,7 @@ import ( type decoratedEdgeGroup struct { portainer.EdgeGroup HasEdgeStack bool `json:"HasEdgeStack"` - HasEdgeGroup bool `json:"HasEdgeGroup"` + HasEdgeJob bool `json:"HasEdgeJob"` EndpointTypes []portainer.EndpointType } @@ -99,7 +99,7 @@ func getEdgeGroupList(tx dataservices.DataStoreTx) ([]decoratedEdgeGroup, error) edgeGroup.EndpointTypes = endpointTypes edgeGroup.HasEdgeStack = usedEdgeGroups[edgeGroup.ID] - edgeGroup.HasEdgeGroup = usedByEdgeJob + edgeGroup.HasEdgeJob = usedByEdgeJob decoratedEdgeGroups = append(decoratedEdgeGroups, edgeGroup) } diff --git a/app/edge/components/groups-datatable/groupsDatatable.html b/app/edge/components/groups-datatable/groupsDatatable.html index e904abf2c..be8aa6ea5 100644 --- a/app/edge/components/groups-datatable/groupsDatatable.html +++ b/app/edge/components/groups-datatable/groupsDatatable.html @@ -78,13 +78,13 @@ id="select_{{ $index }}" type="checkbox" ng-model="item.Checked" - ng-disabled="item.HasEdgeStack || item.HasEdgeGroup" + ng-disabled="item.HasEdgeStack || item.HasEdgeJob" ng-click="$ctrl.selectItem(item, $event)" /> {{ item.Name }} - in use + in use