IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-11 08:05:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Access control: Fix org user removal for OSS users (#52473)

Browse Source 
* allow setting team managed permissions for service accounts

* Revert "allow setting team managed permissions for service accounts"

This reverts commit 7598626397.

* fix org user removal for OSS

* remove comment
This commit is contained in:
Ieva 2022-07-20 10:18:41 +01:00 committed by GitHub
parent 2538fca53a
commit ba76be174f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/app/features/admin/UserOrgs.tsx
View File

@ -164,8 +164,12 @@ class UnThemedOrgRow extends PureComponent<OrgRowProps> {
onOrgRemove = async () => {
const { org, user } = this.props;
user && (await updateUserRoles([], user.id, org.orgId));
this.props.onOrgRemove(org.orgId);
if (contextSrv.licensedAccessControlEnabled()) {
if (contextSrv.hasPermission(AccessControlAction.OrgUsersRemove)) {
user && (await updateUserRoles([], user.id, org.orgId));
}
}
};
onChangeRoleClick = () => {