* allow setting team managed permissions for service accounts * Revert "allow setting team managed permissions for service accounts" This reverts commit7598626397. * fix org user removal for OSS * remove comment (cherry picked from commitba76be174f) Co-authored-by: Ieva <ieva.vasiljeva@grafana.com>
This commit is contained in:
co-authored by
Ieva
parent
21d74574c8
commit
931818b822
@@ -163,8 +163,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 = () => {
|
||||
|
||||
Reference in New Issue
Block a user