From 8be2f900b4d5a47f6e62acfd85d081927b0a77aa Mon Sep 17 00:00:00 2001 From: Danny van Wijk Date: Mon, 22 Apr 2024 10:01:16 +0200 Subject: [PATCH 1/3] Fix node reorder parents --- src/Kunstmaan/NodeBundle/Controller/NodeAdminController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Kunstmaan/NodeBundle/Controller/NodeAdminController.php b/src/Kunstmaan/NodeBundle/Controller/NodeAdminController.php index 9d148cdcdf..9444fed8c6 100644 --- a/src/Kunstmaan/NodeBundle/Controller/NodeAdminController.php +++ b/src/Kunstmaan/NodeBundle/Controller/NodeAdminController.php @@ -644,7 +644,7 @@ public function reorderAction(Request $request): Response $this->init($request); $nodes = []; $nodeIds = $request->request->all('nodes'); - $changeParents = $request->request->get('parent'); + $changeParents = $request->request->all('parent'); foreach ($nodeIds as $id) { /* @var Node $node */ From c05533e11b14ceb640bac3b37c60b22945d41abb Mon Sep 17 00:00:00 2001 From: Christoph Wieseke Date: Tue, 16 Apr 2024 10:04:56 +0200 Subject: [PATCH 2/3] [AdminBundle] fixed base route name for exception admin lists --- .../AdminList/ExceptionAdminListConfigurator.php | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/Kunstmaan/AdminBundle/AdminList/ExceptionAdminListConfigurator.php b/src/Kunstmaan/AdminBundle/AdminList/ExceptionAdminListConfigurator.php index f8349f658c..20eb4b6f69 100644 --- a/src/Kunstmaan/AdminBundle/AdminList/ExceptionAdminListConfigurator.php +++ b/src/Kunstmaan/AdminBundle/AdminList/ExceptionAdminListConfigurator.php @@ -121,4 +121,18 @@ public function getEntityClass(): string { return Exception::class; } + + /** + * @param string|null $suffix + * + * @return string + */ + public function getPathByConvention($suffix = null) + { + if (null === $suffix || $suffix === '') { + return 'kunstmaanadminbundle_admin_exception'; + } + + return sprintf('kunstmaanadminbundle_admin_exception_%s', $suffix); + } } From 84d7a5874c1a4acbdb2d0ac4046b2a402de97abb Mon Sep 17 00:00:00 2001 From: Joeri Verdeyen Date: Mon, 22 Apr 2024 12:12:29 +0200 Subject: [PATCH 3/3] Fixed MessageCatalogue strict type parameters in Translator Loader --- .../TranslatorBundle/Service/Translator/Loader.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Kunstmaan/TranslatorBundle/Service/Translator/Loader.php b/src/Kunstmaan/TranslatorBundle/Service/Translator/Loader.php index f502cf5a60..2a27675950 100644 --- a/src/Kunstmaan/TranslatorBundle/Service/Translator/Loader.php +++ b/src/Kunstmaan/TranslatorBundle/Service/Translator/Loader.php @@ -24,7 +24,11 @@ public function load($resource, $locale, $domain = 'messages') $catalogue = new MessageCatalogue($locale); $translations = $this->translationRepository->findBy(['locale' => $locale]); foreach ($translations as $translation) { - $catalogue->set($translation->getKeyword(), $translation->getText(), $translation->getDomain()); + $catalogue->set( + (string) $translation->getKeyword(), + (string) $translation->getText(), + (string) $translation->getDomain() + ); } $this->catalogues[$locale] = $catalogue; } else {