mirror of
https://github.com/Part-DB/Part-DB-server.git
synced 2026-07-09 02:41:35 +00:00
Compare commits
5 commits
065396d1e9
...
98b8c5b788
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
98b8c5b788 | ||
|
|
e0feda4e46 | ||
|
|
9565a9d548 | ||
|
|
b457298152 | ||
|
|
319ac406a8 |
4 changed files with 9 additions and 3 deletions
2
VERSION
2
VERSION
|
|
@ -1 +1 @@
|
||||||
2.2.1
|
2.3.0
|
||||||
|
|
|
||||||
|
|
@ -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: ['en', 'de', 'it', 'fr', 'ru', 'ja', 'cs', 'da', 'zh', 'pl']
|
enabled_locale: '%partdb.locale_menu%'
|
||||||
translator:
|
translator:
|
||||||
default_path: '%kernel.project_dir%/translations'
|
default_path: '%kernel.project_dir%/translations'
|
||||||
fallbacks:
|
fallbacks:
|
||||||
|
|
|
||||||
|
|
@ -383,6 +383,12 @@ 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, [
|
||||||
|
|
|
||||||
|
|
@ -167,7 +167,7 @@ class EntityImporter
|
||||||
}
|
}
|
||||||
|
|
||||||
//Only return objects once
|
//Only return objects once
|
||||||
return array_values(array_unique($valid_entities));
|
return array_values(array_unique($valid_entities, SORT_REGULAR));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue