groove/Part-DB-server
1
0
Fork 0
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2026-01-19 00:29:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Überarbeitungen: Subassemblies darstellen sowie Parameters losgelöst von Entität zur Anzeige bringen

Browse source
This commit is contained in:
Marcel Diegelmann 2025-10-01 13:56:44 +02:00
parent 9f42e751f5
commit 5ab2cf505e
7 changed files with 64 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -234,13 +234,6 @@ abstract class BaseAdminController extends AbstractController
$repo = $this->entityManager->getRepository($this->entity_class);
$showParameters = true;
if ($this instanceof AssemblyAdminController) {
//currently not needed for assemblies
$showParameters = false;
}
return $this->render($this->twig_template, [
'entity' => $entity,
'form' => $form,
@ -250,7 +243,6 @@ abstract class BaseAdminController extends AbstractController
'timeTravel' => $timeTravel_timestamp,
'repo' => $repo,
'partsContainingElement' => $repo instanceof PartsContainingRepositoryInterface,
'showParameters' => $showParameters,
]);
}
@ -404,20 +396,12 @@ abstract class BaseAdminController extends AbstractController
}
}
$showParameters = true;
if ($this instanceof AssemblyAdminController) {
//currently not needed for assemblies
$showParameters = false;
}
return $this->render($this->twig_template, [
'entity' => $new_entity,
'form' => $form,
'import_form' => $import_form,
'mass_creation_form' => $mass_creation_form,
'route_base' => $this->route_base,
'showParameters' => $showParameters,
]);
}

2
src/Services/ImportExportSystem/BOMImporter.php
View file

@ -857,7 +857,7 @@ class BOMImporter
if (isset($entry['name'])) {
$givenName = trim($entry['name']) === '' ? null : trim ($entry['name']);
if ($givenName !== null && $bomEntry->getPart() !== null && $bomEntry->getPart()->getName() !== $givenName) {
if ($givenName !== null && $part !== null && $part->getName() !== $givenName) {
//Apply different names for parts list entry
$bomEntry->setName(trim($entry['name']) === '' ? null : trim ($entry['name']));
}