Merge branch '7.0' into 7.1

* 7.0: Prepare 6.4.2 release [LeadGenerationBundle] fixed route and type handling [TaggingBundle] fixed base route Fix node reorder
Kunstmaan · Apr 20, 2024 · d24931e · d24931e
2 parents c44c641 + 9c962ff
commit d24931e
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 4 deletions.
diff --git a/src/Kunstmaan/LeadGenerationBundle/AdminList/PopupAdminListConfigurator.php b/src/Kunstmaan/LeadGenerationBundle/AdminList/PopupAdminListConfigurator.php
@@ -80,4 +80,18 @@ public function canAdd()
     {
         return true;
     }
+
+    /**
+     * @param string|null $suffix
+     *
+     * @return string
+     */
+    public function getPathByConvention($suffix = null)
+    {
+        if (null === $suffix || $suffix === '') {
+            return 'kunstmaanleadgenerationbundle_admin_popup_abstractpopup';
+        }
+
+        return sprintf('kunstmaanleadgenerationbundle_admin_popup_abstractpopup_%s', $suffix);
+    }
 }
diff --git a/src/Kunstmaan/LeadGenerationBundle/Controller/PopupsAdminListController.php b/src/Kunstmaan/LeadGenerationBundle/Controller/PopupsAdminListController.php
@@ -64,7 +64,9 @@ public function editAction(Request $request, $id): Response
     #[Route(path: '/add', name: 'kunstmaanleadgenerationbundle_admin_popup_abstractpopup_add', methods: ['GET', 'POST'])]
     public function addAction(Request $request): Response
     {
-        $type = $request->query->get('type');
+        $type = $request->isMethod('post')
+            ? $request->request->get('type')
+            : $request->query->get('type');
 
         return parent::doAddAction($this->getAdminListConfigurator(), $type, $request);
     }

diff --git a/src/Kunstmaan/LeadGenerationBundle/Controller/RulesAdminListController.php b/src/Kunstmaan/LeadGenerationBundle/Controller/RulesAdminListController.php
@@ -34,7 +34,9 @@ public function detailAction(Request $request, $popup)
     #[Route(path: '/{popup}/add', requirements: ['popup' => '\d+'], name: 'kunstmaanleadgenerationbundle_admin_rule_abstractrule_add', methods: ['GET', 'POST'])]
     public function addAction(Request $request, $popup): Response
     {
-        $type = $request->query->get('type');
+        $type = $request->isMethod('post')
+            ? $request->request->get('type')
+            : $request->query->get('type');
 
         return parent::doAddAction($this->getAdminListConfigurator($popup), $type, $request);
     }

diff --git a/src/Kunstmaan/NodeBundle/Controller/NodeAdminController.php b/src/Kunstmaan/NodeBundle/Controller/NodeAdminController.php
@@ -639,11 +639,11 @@ public function addHomepageAction(Request $request): RedirectResponse
     }
 
     #[Route(path: '/reorder', name: 'KunstmaanNodeBundle_nodes_reorder', methods: ['POST'])]
-    public function reorderAction(Request $request): string
+    public function reorderAction(Request $request): Response
     {
         $this->init($request);
         $nodes = [];
-        $nodeIds = $request->request->get('nodes');
+        $nodeIds = $request->request->all('nodes');
         $changeParents = $request->request->get('parent');
 
         foreach ($nodeIds as $id) {

diff --git a/src/Kunstmaan/TaggingBundle/AdminList/TagAdminListConfigurator.php b/src/Kunstmaan/TaggingBundle/AdminList/TagAdminListConfigurator.php
@@ -43,4 +43,18 @@ public function getEntityClass(): string
     {
         return Tag::class;
     }
+
+    /**
+     * @param string|null $suffix
+     *
+     * @return string
+     */
+    public function getPathByConvention($suffix = null)
+    {
+        if (null === $suffix || $suffix === '') {
+            return 'kunstmaantaggingbundle_admin_tag';
+        }
+
+        return sprintf('kunstmaantaggingbundle_admin_tag_%s', $suffix);
+    }
 }