From 319ac406a818d63ba954af039c1af37ba5486f2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Sun, 7 Dec 2025 20:50:09 +0100 Subject: [PATCH 1/5] Update the mass creation form, so that you can see the newly created entities in dropdown Fixes issue #1103 --- src/Controller/AdminPages/BaseAdminController.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Controller/AdminPages/BaseAdminController.php b/src/Controller/AdminPages/BaseAdminController.php index 558c7bb2..b2c5e751 100644 --- a/src/Controller/AdminPages/BaseAdminController.php +++ b/src/Controller/AdminPages/BaseAdminController.php @@ -383,6 +383,9 @@ abstract class BaseAdminController extends AbstractController if (count($results) > 0) { $this->addFlash('success', t('entity.mass_creation_flash', ['%COUNT%' => $created_count])); } + + //Recreate mass creation form, so we get the updated parent list and empty lines + $mass_creation_form = $this->createForm(MassCreationForm::class, ['entity_class' => $this->entity_class]); } return $this->render($this->twig_template, [ From b457298152435455d76d218372148c3560da5a5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Sun, 7 Dec 2025 21:33:41 +0100 Subject: [PATCH 2/5] Do not clear the mass import form if errors appeared --- src/Controller/AdminPages/BaseAdminController.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Controller/AdminPages/BaseAdminController.php b/src/Controller/AdminPages/BaseAdminController.php index b2c5e751..4378f7a3 100644 --- a/src/Controller/AdminPages/BaseAdminController.php +++ b/src/Controller/AdminPages/BaseAdminController.php @@ -380,12 +380,15 @@ abstract class BaseAdminController extends AbstractController } $em->flush(); - if (count($results) > 0) { + if (count($created_count) > 0) { $this->addFlash('success', t('entity.mass_creation_flash', ['%COUNT%' => $created_count])); } - //Recreate mass creation form, so we get the updated parent list and empty lines - $mass_creation_form = $this->createForm(MassCreationForm::class, ['entity_class' => $this->entity_class]); + if (count($errors)) { + //Recreate mass creation form, so we get the updated parent list and empty lines + $mass_creation_form = $this->createForm(MassCreationForm::class, ['entity_class' => $this->entity_class]); + } + } return $this->render($this->twig_template, [ From 9565a9d548ea44317ec7cfc3744afd57b564dbcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Sun, 7 Dec 2025 21:40:57 +0100 Subject: [PATCH 3/5] Fixed error with mass creation, when elements on different level had the same name Fixes issue #1104 --- src/Controller/AdminPages/BaseAdminController.php | 2 +- src/Services/ImportExportSystem/EntityImporter.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Controller/AdminPages/BaseAdminController.php b/src/Controller/AdminPages/BaseAdminController.php index 4378f7a3..7c109751 100644 --- a/src/Controller/AdminPages/BaseAdminController.php +++ b/src/Controller/AdminPages/BaseAdminController.php @@ -380,7 +380,7 @@ abstract class BaseAdminController extends AbstractController } $em->flush(); - if (count($created_count) > 0) { + if (count($results) > 0) { $this->addFlash('success', t('entity.mass_creation_flash', ['%COUNT%' => $created_count])); } diff --git a/src/Services/ImportExportSystem/EntityImporter.php b/src/Services/ImportExportSystem/EntityImporter.php index 459866ba..a89be9dc 100644 --- a/src/Services/ImportExportSystem/EntityImporter.php +++ b/src/Services/ImportExportSystem/EntityImporter.php @@ -167,7 +167,7 @@ class EntityImporter } //Only return objects once - return array_values(array_unique($valid_entities)); + return array_values(array_unique($valid_entities, SORT_REGULAR)); } /** From e0feda4e466a9a764561f6556ddb70b12032ae12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Sun, 7 Dec 2025 22:47:27 +0100 Subject: [PATCH 4/5] Fixed 2DA login Fixes issue #1141 --- config/packages/translation.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/packages/translation.yaml b/config/packages/translation.yaml index a3f529e3..cbc1cd7e 100644 --- a/config/packages/translation.yaml +++ b/config/packages/translation.yaml @@ -1,7 +1,7 @@ framework: default_locale: 'en' # Just enable the locales we need for performance reasons. - enabled_locale: ['en', 'de', 'it', 'fr', 'ru', 'ja', 'cs', 'da', 'zh', 'pl'] + enabled_locale: '%partdb.locale_menu%' translator: default_path: '%kernel.project_dir%/translations' fallbacks: From 98b8c5b788aac772a66b4de1f92c356ddc776370 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Sun, 7 Dec 2025 22:47:59 +0100 Subject: [PATCH 5/5] Bump to version 2.3.0 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c043eea7..276cbf9e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.1 +2.3.0