diff --git a/modules/recurring_events_registration/src/RegistrantAccessControlHandler.php b/modules/recurring_events_registration/src/RegistrantAccessControlHandler.php index 3d58f29c721f7c5bcc8d06ad4253c2f3601bef8f..149691a9c2ae72ae96c1e920584895bdfa71ff09 100644 --- a/modules/recurring_events_registration/src/RegistrantAccessControlHandler.php +++ b/modules/recurring_events_registration/src/RegistrantAccessControlHandler.php @@ -73,13 +73,19 @@ class RegistrantAccessControlHandler extends EntityAccessControlHandler implemen if ($account->id() !== $entity->getOwnerId()) { return AccessResult::allowedIfHasPermission($account, 'edit registrant entities'); } - return AccessResult::allowedIfHasPermission($account, 'edit own registrant entities'); + return AccessResult::allowedIfHasPermissions($account, [ + 'edit registrant entities', + 'edit own registrant entities', + ], 'OR'); case 'delete': if ($account->id() !== $entity->getOwnerId()) { return AccessResult::allowedIfHasPermission($account, 'delete registrant entities'); } - return AccessResult::allowedIfHasPermission($account, 'delete own registrant entities'); + return AccessResult::allowedIfHasPermissions($account, [ + 'delete registrant entities', + 'delete own registrant entities', + ], 'OR'); case 'resend': return AccessResult::allowedIfHasPermission($account, 'resend registrant emails'); diff --git a/src/EventInstanceAccessControlHandler.php b/src/EventInstanceAccessControlHandler.php index c1b42ab0c5a4c66a2747e7333dc0878e890437b3..86dac554d8eb2c2062a052e05a2a220fb3213b67 100644 --- a/src/EventInstanceAccessControlHandler.php +++ b/src/EventInstanceAccessControlHandler.php @@ -33,13 +33,19 @@ class EventInstanceAccessControlHandler extends EntityAccessControlHandler { if ($account->id() !== $entity->getOwnerId()) { return AccessResult::allowedIfHasPermission($account, 'edit eventinstance entity'); } - return AccessResult::allowedIfHasPermission($account, 'edit own eventinstance entity'); + return AccessResult::allowedIfHasPermissions($account, [ + 'edit eventinstance entity', + 'edit own eventinstance entity', + ], 'OR'); case 'delete': if ($account->id() !== $entity->getOwnerId()) { return AccessResult::allowedIfHasPermission($account, 'delete eventinstance entity'); } - return AccessResult::allowedIfHasPermission($account, 'delete own eventinstance entity'); + return AccessResult::allowedIfHasPermissions($account, [ + 'delete eventinstance entity', + 'delete own eventinstance entity', + ], 'OR'); case 'clone': return AccessResult::allowedIfHasPermission($account, 'clone eventinstance entity'); diff --git a/src/EventSeriesAccessControlHandler.php b/src/EventSeriesAccessControlHandler.php index b06f86d4a86f796be2932529a54e5d6189dbeb0f..5ec6529ad3e882b31586f4ba0cb38313000d28b8 100644 --- a/src/EventSeriesAccessControlHandler.php +++ b/src/EventSeriesAccessControlHandler.php @@ -33,13 +33,19 @@ class EventSeriesAccessControlHandler extends EntityAccessControlHandler { if ($account->id() !== $entity->getOwnerId()) { return AccessResult::allowedIfHasPermission($account, 'edit eventseries entity'); } - return AccessResult::allowedIfHasPermission($account, 'edit own eventseries entity'); + return AccessResult::allowedIfHasPermissions($account, [ + 'edit eventseries entity', + 'edit own eventseries entity', + ], 'OR'); case 'delete': if ($account->id() !== $entity->getOwnerId()) { return AccessResult::allowedIfHasPermission($account, 'delete eventseries entity'); } - return AccessResult::allowedIfHasPermission($account, 'delete own eventseries entity'); + return AccessResult::allowedIfHasPermissions($account, [ + 'delete eventseries entity', + 'delete own eventseries entity', + ], 'OR'); case 'clone': return AccessResult::allowedIfHasPermission($account, 'clone eventseries entity');