Revert to previous permission check; remove unassign button instead

omeka · Apr 1, 2024 · f4e0fdd · f4e0fdd
1 parent cad4f2a
commit f4e0fdd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git 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
@@ -65,12 +65,7 @@ $siteTemplate = '
         <tr class="resource-row">
             <td class="data-value" data-row-key="child-search"><?php echo $this->escapeHtml($site->title()); ?></td>
             <td class="data-value" data-row-key="resource-email"><?php echo $this->escapeHtml($site->owner()->email()); ?></td>
-            <td>
-                <ul class="actions">
-                    <li><?php echo $this->hyperlink('', '#', ['class' => 'o-icon-delete', 'title' => $this->translate('Unassign from site')]); ?></li>
-                </ul>
-                <input type="hidden" name="o:site[]" class="resource-id" value="<?php echo $this->escapeHtml($site->id()); ?>">
-            </td>
+            <td></td>
         </tr>
         <?php endforeach; ?>
     </tbody>