mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-06-21 09:35:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed errors that prevented import of users

Browse source
This commit is contained in:
Jan Böhmer 2023-03-13 22:43:26 +01:00
parent 9188331c1e
commit 3bbff0aecf
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/Controller/AdminPages/BaseAdminController.php
View file

@ -350,8 +350,8 @@ abstract class BaseAdminController extends AbstractController
}
$options = [
'parent' => $data['parent'],
'preserve_children' => $data['preserve_children'],
'parent' => $data['parent'] ?? null,
'preserve_children' => $data['preserve_children'] ?? false,
'format' => $format,
'class' => $this->entity_class,
'csv_delimiter' => $data['csv_delimiter'],
@ -361,15 +361,14 @@ abstract class BaseAdminController extends AbstractController
try {
$errors = $importer->importFileAndPersistToDB($file, $options);
foreach ($errors as $name => $error) {
/** @var ConstraintViolationList $error */
$this->addFlash('error', $name.': '.$error['violations']);
}
}
catch (UnexpectedValueException $e) {
$this->addFlash('error', 'parts.import.flash.error.invalid_file');
goto ret;
}
foreach ($errors as $name => $error) {
/** @var ConstraintViolationList $error */
$this->addFlash('error', $name.': '.$error['violations']);
}
}