mirror of
https://github.com/Part-DB/Part-DB-server.git
synced 2026-01-13 13:49:33 +00:00
Rebase auf Part-DB v2.1.2
This commit is contained in:
parent
7abc37fc9a
commit
360fed1f5e
33 changed files with 1020 additions and 162 deletions
|
|
@ -193,10 +193,6 @@ class ProjectController extends AbstractController
|
|||
}
|
||||
|
||||
// For PCB imports, proceed directly
|
||||
$entries = $BOMImporter->importFileIntoProject($form->get('file')->getData(), $project, [
|
||||
'type' => $import_type,
|
||||
]);
|
||||
|
||||
$importerResult = $BOMImporter->importFileIntoProject($form->get('file')->getData(), $project, [
|
||||
'type' => $import_type,
|
||||
]);
|
||||
|
|
@ -425,7 +421,7 @@ class ProjectController extends AbstractController
|
|||
}
|
||||
|
||||
// Import with field mapping and priorities (validation already passed)
|
||||
$entries = $BOMImporter->stringToBOMEntries($file_content, [
|
||||
$entries = $BOMImporter->stringToBOMEntries($project, $file_content, [
|
||||
'type' => 'kicad_schematic',
|
||||
'field_mapping' => $field_mapping,
|
||||
'field_priorities' => $field_priorities,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue