From f4e0fdd2efc6a80d572f27145d6e64c235ba7da4 Mon Sep 17 00:00:00 2001 From: Jim Safley Date: Mon, 1 Apr 2024 18:30:05 -0400 Subject: [PATCH] Revert to previous permission check; remove unassign button instead --- application/src/Api/Adapter/ItemAdapter.php | 2 +- application/view/omeka/admin/item/manage-sites.phtml | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/application/src/Api/Adapter/ItemAdapter.php b/application/src/Api/Adapter/ItemAdapter.php index 6a371454d..371009492 100644 --- a/application/src/Api/Adapter/ItemAdapter.php +++ b/application/src/Api/Adapter/ItemAdapter.php @@ -272,7 +272,7 @@ public function hydrate(Request $request, EntityInterface $entity, if (!$append && !$remove) { // Remove sites that were not included in the passed data. foreach ($sites as $site) { - if (!in_array($site, $sitesToRetain)) { + if (!in_array($site, $sitesToRetain) && $acl->userIsAllowed($site, 'can-assign-items')) { $sites->removeElement($site); } } diff --git a/application/view/omeka/admin/item/manage-sites.phtml b/application/view/omeka/admin/item/manage-sites.phtml index 4d03fa3d4..08e710f43 100644 --- a/application/view/omeka/admin/item/manage-sites.phtml +++ b/application/view/omeka/admin/item/manage-sites.phtml @@ -65,12 +65,7 @@ $siteTemplate = ' escapeHtml($site->title()); ?> escapeHtml($site->owner()->email()); ?> - - - - +