fixes

anstiftung · Mar 4, 2025 · 82a4bb5 · 82a4bb5
1 parent f7f0972
commit 82a4bb5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/src/Controller/EventsController.php b/src/Controller/EventsController.php
@@ -583,9 +583,7 @@ public function ajaxGetAllEventsForMap(): void
         }
 
         $categoriesTable = $this->getTableLocator()->get('Categories');
-        $categoriesMap = $categoriesTable->getMainCategoriesForFrontend()->formatResults(function ($results) {
-            return $results->indexBy('id');
-        })->toArray();
+        $categoriesMap = $categoriesTable->getMainCategoriesForFrontendIndexedById();
         $this->set('categoriesMap', $categoriesMap);
 
         foreach($events as $event) {
@@ -642,9 +640,7 @@ public function all(): void
         $this->set('isOnlineEvent', $isOnlineEvent);
 
         $categoriesTable = $this->getTableLocator()->get('Categories');
-        $categoriesMap = $categoriesTable->getMainCategoriesForFrontend()->formatResults(function ($results) {
-            return $results->indexBy('id');
-        })->toArray();
+        $categoriesMap = $categoriesTable->getMainCategoriesForFrontendIndexedById();
         $this->set('categoriesMap', $categoriesMap);
 
         $preparedCategories = [];
@@ -760,6 +756,7 @@ public function all(): void
             $query->where(['Events.is_online_event' => 1]);
         }
 
+        $query->select($eventsTable->getListFields());
         $query->orderBy($eventsTable->getListOrder());
         $query->contain([
             'Workshops',

diff --git a/src/Model/Table/CategoriesTable.php b/src/Model/Table/CategoriesTable.php
@@ -177,6 +177,13 @@ public function getCategoriesForStatisticsGlobal(): array
         return $categories;
     }
 
+    public function getMainCategoriesForFrontendIndexedById(): array
+    {
+        return $this->getMainCategoriesForFrontend()->formatResults(function ($results) {
+            return $results->indexBy('id');
+        })->toArray();
+    }
+
     public function getMainCategoriesForFrontend(): SelectQuery
     {
         $categories = $this->find('all',