5110: Made event organizer required

Author: rimi-itk

CHANGELOG.md

@@ -8,7 +8,7 @@ See [keep a changelog] for information about writing changes to this log.
 
 ## [Unreleased]
 
-- Updated fixtures
+- Updated fixtures. Made event organizer required.
 
 ## [1.1.6] - 2025-03-27
 

src/Controller/Admin/EventCrudController.php

@@ -7,12 +7,10 @@
 use App\Service\ImageServiceInterface;
 use App\Types\UserRoles;
 use Doctrine\Common\Collections\Order;
-use Doctrine\ORM\QueryBuilder;
 use EasyCorp\Bundle\EasyAdminBundle\Collection\FieldCollection;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Asset;
-use EasyCorp\Bundle\EasyAdminBundle\Config\Assets;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Filters;
 use EasyCorp\Bundle\EasyAdminBundle\Config\KeyValueStore;
@@ -134,20 +132,22 @@ public function configureFields(string $pageName): iterable
         yield FormField::addFieldset('Organizer information')
                 ->setLabel(new TranslatableMessage('admin.event.organizer.headline'));
 
-        if ($this->isGranted(UserRoles::ROLE_EDITOR->value)) {
-            yield AssociationField::new('organization')
-                ->setLabel(new TranslatableMessage('admin.event.edited.organization'));
-        } else {
-            yield AssociationField::new('organization')
-                ->setLabel(new TranslatableMessage('admin.event.edited.organization'))
-                ->setQueryBuilder(
-                    fn (QueryBuilder $queryBuilder) => $queryBuilder
-                        ->select('o')
-                        ->from(Organization::class, 'o')
-                        ->where(':user MEMBER OF o.users')
-                        ->setParameter('user', $this->getUser())
-                );
+        $organization = AssociationField::new('organization')
+            ->setLabel(new TranslatableMessage('admin.event.edited.organization'))
+            // We assume at least one organization exist for non-editor users
+            // (cf. editor stuff below).
+            ->setRequired(true)
+            ->setFormTypeOption('placeholder', new TranslatableMessage('admin.event.organizer.placeholder'));
+        // Limit organization choices for non-editors to the organizations the user is a member of.
+        if (!$this->isGranted(UserRoles::ROLE_EDITOR->value)) {
+            $userOrganizations = $this->getUser()->getOrganizations();
+            $organization
+                ->setFormTypeOption('choices', $userOrganizations)
+                // Make sure that the user is not forced to make a choice if none exists.
+                ->setRequired($userOrganizations->count() > 0);
         }
+        yield $organization;
+
         yield AssociationField::new('partners')
                 ->setLabel(new TranslatableMessage('admin.event.edited.partners'))
                 ->hideOnDetail();

translations/messages+intl-icu.da.xlf

@@ -653,6 +653,10 @@
         <source>admin.user.registrationNotes</source>
         <target state="translated">Ønskede arrangører</target>
       </trans-unit>
+      <trans-unit id="MaqqeAe" resname="admin.event.organizer.placeholder">
+        <source>admin.event.organizer.placeholder</source>
+        <target state="translated">Vælg arrangør</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>

translations/messages+intl-icu.en.xlf

@@ -653,6 +653,10 @@
         <source>admin.user.registrationNotes</source>
         <target>Requested organizers</target>
       </trans-unit>
+      <trans-unit id="MaqqeAe" resname="admin.event.organizer.placeholder">
+        <source>admin.event.organizer.placeholder</source>
+        <target>admin.event.organizer.placeholder</target>
+      </trans-unit>
     </body>
   </file>
 </xliff>