Compare commits

..

No commits in common. "98b8c5b788aac772a66b4de1f92c356ddc776370" and "065396d1e92561cd3156ed7b89254c6307da925d" have entirely different histories.

4 changed files with 3 additions and 9 deletions

View file

@ -1 +1 @@
2.3.0 2.2.1

View file

@ -1,7 +1,7 @@
framework: framework:
default_locale: 'en' default_locale: 'en'
# Just enable the locales we need for performance reasons. # Just enable the locales we need for performance reasons.
enabled_locale: '%partdb.locale_menu%' enabled_locale: ['en', 'de', 'it', 'fr', 'ru', 'ja', 'cs', 'da', 'zh', 'pl']
translator: translator:
default_path: '%kernel.project_dir%/translations' default_path: '%kernel.project_dir%/translations'
fallbacks: fallbacks:

View file

@ -383,12 +383,6 @@ abstract class BaseAdminController extends AbstractController
if (count($results) > 0) { if (count($results) > 0) {
$this->addFlash('success', t('entity.mass_creation_flash', ['%COUNT%' => $created_count])); $this->addFlash('success', t('entity.mass_creation_flash', ['%COUNT%' => $created_count]));
} }
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, [ return $this->render($this->twig_template, [

View file

@ -167,7 +167,7 @@ class EntityImporter
} }
//Only return objects once //Only return objects once
return array_values(array_unique($valid_entities, SORT_REGULAR)); return array_values(array_unique($valid_entities));
} }
/** /**