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

Merge remote-tracking branch 'origin/feature/create-assemblies' into feature/all-features

Browse source 
# Conflicts:
#	src/Controller/AdminPages/BaseAdminController.php
This commit is contained in:
Marcel Diegelmann 2025-10-01 14:00:53 +02:00
commit e9ee80cd53
9 changed files with 61 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
templates/admin/base_admin.html.twig
View file

@ -86,7 +86,7 @@
<li class="nav-item">
<a data-bs-toggle="tab" class="nav-link link-anchor" href="#attachments">{% trans %}admin.attachments{% endtrans %}</a>
</li>
{% if entity.parameters is defined and showParameters == true %}
{% if entity.parameters is defined %}
<li class="nav-item">
<a data-bs-toggle="tab" class="nav-link link-anchor" href="#parameters">{% trans %}admin.parameters{% endtrans %}</a>
</li>
@ -201,4 +201,4 @@
</turbo-frame>
</div>
</div>
{% endblock %}
{% endblock %}