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

Merge remote-tracking branch 'origin/master' into order-details

Browse source 
# Conflicts:
#	src/Entity/Parts/Part.php
This commit is contained in:
Fabian Wunsch 2025-10-16 13:00:05 +02:00
commit 3408334a1f
104 changed files with 12100 additions and 1406 deletions
Download patch file Download diff file Expand all files Collapse all files

26
templates/parts/edit/edit_part_info.html.twig
View file

@ -4,6 +4,32 @@
{% trans with {'%name%': part.name|escape } %}part.edit.title{% endtrans %}
{% endblock %}
{% block before_card %}
{% if bulk_job and jobId %}
<div class="alert alert-info mb-3">
<div class="d-flex justify-content-between align-items-center">
<div class="d-flex align-items-center">
<a href="{{ path('bulk_info_provider_step2', {jobId: bulk_job.id}) }}" class="btn btn-outline-primary btn-sm me-2">
<i class="fas fa-arrow-left fa-fw" aria-hidden="true"></i>
{% trans %}info_providers.bulk_import.back{% endtrans %}
</a>
<form method="post" action="{{ path('part_bulk_import_complete', {id: part.id, jobId: bulk_job.id}) }}" style="display: inline;">
<input type="hidden" name="_token" value="{{ csrf_token('bulk_complete_' ~ part.id) }}">
<button type="submit" class="btn btn-primary btn-sm me-3">
<i class="fas fa-check fa-fw" aria-hidden="true"></i>
{% trans %}info_providers.bulk_import.complete{% endtrans %}
</button>
</form>
<div>
<i class="fas fa-cloud-download fa-fw" aria-hidden="true"></i>
{% trans %}info_providers.bulk_import.editing_part{% endtrans %}
</div>
</div>
</div>
</div>
{% endif %}
{% endblock %}
{% block card_title %}
<i class="fas fa-edit fa-fw" aria-hidden="true"></i>
{% trans with {'%name%': part.name|escape } %}part.edit.card_title{% endtrans %}

13
templates/parts/edit/update_from_ip.html.twig
View file

@ -5,6 +5,19 @@
{% block card_border %}border-info{% endblock %}
{% block card_type %}bg-info text-bg-info{% endblock %}
{% block before_card %}
{% if bulk_job and jobId %}
<div class="alert alert-info mb-3">
<div class="d-flex justify-content-between align-items-center">
<div>
<i class="fas fa-cloud-download fa-fw" aria-hidden="true"></i>
{% trans %}info_providers.bulk_import.editing_part{% endtrans %}
</div>
</div>
</div>
{% endif %}
{% endblock %}
{% block title %}
{% trans %}info_providers.update_part.title{% endtrans %}: {{ merge_old_name }}
{% endblock %}