centralcloud/oncall-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix teams duplication and user list permission control (#1591)

Browse source 
# What this PR does

## Which issue(s) this PR fixes

## Checklist

- [ ] Tests updated
- [ ] Documentation added
- [ ] `CHANGELOG.md` updated
This commit is contained in:
Ildar Iskhakov 2023-03-22 14:38:31 +08:00 • committed by GitHub
parent 58dbcd9439
commit 748e8462a4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
engine/apps/user_management/models/user.py
View file

@ -188,7 +188,7 @@ class User(models.Model):
def available_teams(self):
if self.role == LegacyAccessControlRole.ADMIN:
return self.organization.teams.all()
return self.organization.teams.filter(Q(is_sharing_resources_to_all=True) | Q(users=self))
return self.organization.teams.filter(Q(is_sharing_resources_to_all=True) | Q(users=self)).distinct()
@property
def is_authenticated(self):

32
grafana-plugin/src/containers/TeamsList/TeamsList.tsx
View file

@ -52,20 +52,20 @@ const TeamsList = observer(() => {
const renderActionButtons = (record: GrafanaTeam) => {
const editButton = (
<WithPermissionControlTooltip userAction={UserActions.APIKeysWrite}>
<HorizontalGroup justify="flex-end">
<Tooltip content="Default team will be selected when creating new resources">
<Button
onClick={async () => {
await userStore.updateCurrentUser({ current_team: record.id });
store.grafanaTeamStore.updateItems();
}}
disabled={isTeamDefault(record)}
fill="text"
>
Make default
</Button>
</Tooltip>
<HorizontalGroup justify="flex-end">
<Tooltip content="Default team will be selected when creating new resources">
<Button
onClick={async () => {
await userStore.updateCurrentUser({ current_team: record.id });
store.grafanaTeamStore.updateItems();
}}
disabled={isTeamDefault(record)}
fill="text"
>
Make default
</Button>
</Tooltip>
<WithPermissionControlTooltip userAction={UserActions.TeamsWrite}>
<Button
fill="text"
disabled={record.id === 'null'}
@ -76,8 +76,8 @@ const TeamsList = observer(() => {
>
Edit
</Button>
</HorizontalGroup>
</WithPermissionControlTooltip>
</WithPermissionControlTooltip>
</HorizontalGroup>
);
return editButton;
};