groove/Part-DB-server
1
0
Fork 0
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2026-01-16 07:09:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Korrekturen vornehmen

Browse source
This commit is contained in:
Marcel Diegelmann 2025-10-01 04:56:33 +02:00
parent 3f0738fa9e
commit 773c95eb38
2 changed files with 2 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -858,7 +858,7 @@ class BOMImporter
if (isset($entry['name'])) { if (isset($entry['name'])) {
$givenName = trim($entry['name']) === '' ? null : trim ($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 //Apply different names for parts list entry
$bomEntry->setName(trim($entry['name']) === '' ? null : trim ($entry['name'])); $bomEntry->setName(trim($entry['name']) === '' ? null : trim ($entry['name']));
} }

17
templates/assemblies/info/info.html.twig
View file

@ -70,16 +70,6 @@
{% trans %}assembly.info.info.label{% endtrans %} {% trans %}assembly.info.info.label{% endtrans %}
</button> </button>
</li> </li>
{% if assembly.children is not empty %}
<li class="nav-item" role="presentation">
<button class="nav-link" id="subassemblies-tab" data-bs-toggle="tab" data-bs-target="#subassemblies-tab-pane"
type="button" role="tab" aria-controls="subassemblies-tab-pane" aria-selected="false">
<i class="fa-solid fa-folder-tree fa-fw"></i>
{% trans %}assembly.info.sub_assemblies.label{% endtrans %}
<span class="badge bg-secondary">{{ assembly.children | length }}</span>
</button>
</li>
{% endif %}
<li class="nav-item" role="presentation"> <li class="nav-item" role="presentation">
<button class="nav-link" id="bom-tab" data-bs-toggle="tab" data-bs-target="#part-tab-pane" <button class="nav-link" id="bom-tab" data-bs-toggle="tab" data-bs-target="#part-tab-pane"
type="button" role="tab" aria-controls="part-tab-pane" aria-selected="false"> type="button" role="tab" aria-controls="part-tab-pane" aria-selected="false">
@ -116,13 +106,8 @@
</div> </div>
<div class="tab-pane fade" id="part-tab-pane" role="tabpanel" aria-labelledby="part-tab" tabindex="0"> <div class="tab-pane fade" id="part-tab-pane" role="tabpanel" aria-labelledby="part-tab" tabindex="0">
{% include "assemblies/info/_part.html.twig" %} {% include "assemblies/info/_part.html.twig" %}
{% if assembly.children is not empty %}
<div class="tab-pane fade" id="subassemblies-tab-pane" role="tabpanel" aria-labelledby="bom-tab" tabindex="0">
{% include "assemblies/info/_subassemblies.html.twig" %}
</div>
{% endif %}
<div class="tab-pane fade" id="bom-tab-pane" role="tabpanel" aria-labelledby="bom-tab" tabindex="0"> <div class="tab-pane fade" id="bom-tab-pane" role="tabpanel" aria-labelledby="bom-tab" tabindex="0">
{% include "assemblies/info/_bom.html.twig" %} {% include "assemblies/info/_part.html.twig" %}
</div> </div>
<div class="tab-pane fade" id="attachments-tab-pane" role="tabpanel" aria-labelledby="attachments-tab" tabindex="0"> <div class="tab-pane fade" id="attachments-tab-pane" role="tabpanel" aria-labelledby="attachments-tab" tabindex="0">
{% include "assemblies/info/_attachments_info.html.twig" with {"assembly": assembly} %} {% include "assemblies/info/_attachments_info.html.twig" with {"assembly": assembly} %}