From 74dd06a36c589454c5edcee9471e7f315cd456dc Mon Sep 17 00:00:00 2001 From: Craig Williams Date: Wed, 13 Sep 2023 09:08:25 +0100 Subject: [PATCH] Fix syntax error in permission string --- src/Database/Seeds/OrganisationPermissions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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)";