diff --git a/src/Database/Seeds/OrganisationPermissions.php b/src/Database/Seeds/OrganisationPermissions.php index 41702a0..8167103 100644 --- a/src/Database/Seeds/OrganisationPermissions.php +++ b/src/Database/Seeds/OrganisationPermissions.php @@ -50,8 +50,8 @@ class OrganisationPermissions extends BaseSeed 'organisations-admin' => Role::where('slug', 'organisations-admin')->first()->id, ]; - $canAdminOrgUsers = "(has_role(self.id,{$roleIds['organisations-admin']}) || (has_matching_organisation(self.id,user.id,1) && !has_role(user.id,{$roleIds['organisations-admin']}))"; - $canAdminOrgAdmins = "(has_role(self.id,{$roleIds['organisations-admin']}) || (has_matching_organisation(self.id,user.id,1))"; + $canAdminOrgUsers = "(has_role(self.id,{$roleIds['organisations-admin']}) || (has_matching_organisation(self.id,user.id,1) && !has_role(user.id,{$roleIds['organisations-admin']})))"; + $canAdminOrgAdmins = "(has_role(self.id,{$roleIds['organisations-admin']}) || has_matching_organisation(self.id,user.id,1))"; $excludeMasters = "(!is_master(user.id) && !has_role(user.id,{$roleIds['site-admin']}))"; $isSelf = "equals_num(self.id,user.id)";