Merge commit 'refs/pull/487/head' of github.com:alchemy-fr/phraseanet…

…-services into w2445
alchemy-fr · Nov 15, 2024 · 990db79 · 990db79
2 parents 99d3d5c + c35f32e
commit 990db79
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/databox/api/src/Controller/Admin/AttributeDefinitionCrudController.php b/databox/api/src/Controller/Admin/AttributeDefinitionCrudController.php
@@ -98,7 +98,7 @@ public function configureFields(string $pageName): iterable
         yield Field::new('facetEnabled')
             ->hideOnIndex();
         yield ArrayField::new('fallback')
-            ->hideOnIndex();
+            ->onlyOnDetail();
         yield TextField::new('key')
             ->hideOnIndex();
         yield IntegerField::new('position');

diff --git a/databox/api/src/Security/Voter/AssetVoter.php b/databox/api/src/Security/Voter/AssetVoter.php
@@ -72,10 +72,7 @@ protected function voteOnAttribute(string $attribute, $subject, TokenInterface $
                 return $isOwner()
                     || $this->security->isGranted(self::SCOPE_PREFIX.'DELETE')
                     || $this->hasAcl(PermissionInterface::DELETE, $subject, $token)
-                    || (
-                        null !== $subject->getReferenceCollection()
-                        && $this->hasAcl(PermissionInterface::DELETE, $subject->getReferenceCollection(), $token)
-                    );
+                    || $this->voteOnContainer($subject, AbstractVoter::DELETE);
             case self::EDIT_PERMISSIONS:
                 return $isOwner()
                     || $this->security->isGranted(self::SCOPE_PREFIX.'OWNER')