mirror of
https://github.com/Part-DB/Part-DB-server.git
synced 2026-02-21 17:22:28 +01:00
Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
70cde4c3a8 | ||
|
|
28e6ca52fe | ||
|
|
5b4c1505b7 | ||
|
|
8ad3c2e612 | ||
|
|
d7ed2225b4 |
@@ -108,11 +108,19 @@ export default class extends Controller {
|
||||
const raw_order = saved_state.order;
|
||||
|
||||
settings.initial_order = raw_order.map((order) => {
|
||||
//Skip if direction is empty, as this is the default, otherwise datatables server is confused when the order is sent in the request, but the initial order is set to an empty direction
|
||||
if (order[1] === '') {
|
||||
return null;
|
||||
}
|
||||
|
||||
return {
|
||||
column: order[0],
|
||||
dir: order[1]
|
||||
}
|
||||
});
|
||||
|
||||
//Remove null values from the initial_order array
|
||||
settings.initial_order = settings.initial_order.filter(order => order !== null);
|
||||
}
|
||||
|
||||
let options = {
|
||||
|
||||
@@ -117,7 +117,6 @@ class PartLotType extends AbstractType
|
||||
'widget' => 'single_text',
|
||||
'disabled' => !$this->security->isGranted('@parts_stock.stocktake'),
|
||||
'required' => false,
|
||||
'empty_data' => null,
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
@@ -41,35 +41,37 @@
|
||||
{{ lot.amount | format_amount(part.partUnit, {'decimals': 5}) }}
|
||||
{% endif %}
|
||||
</td>
|
||||
<td class="d-flex flex-column align-items-start">
|
||||
{% if lot.owner %}
|
||||
<span class="badge text-bg-light mb-1" title="{% trans %}part_lot.owner{% endtrans %}">
|
||||
<td >
|
||||
<div class="d-flex flex-column align-items-start">
|
||||
{% if lot.owner %}
|
||||
<span class="badge text-bg-light mb-1" title="{% trans %}part_lot.owner{% endtrans %}">
|
||||
{{ helper.user_icon_link(lot.owner) }}
|
||||
</span>
|
||||
{% endif %}
|
||||
{% if lot.expirationDate %}
|
||||
<span class="badge text-bg-info mb-1" title="{% trans %}part_lots.expiration_date{% endtrans %}">
|
||||
{% endif %}
|
||||
{% if lot.expirationDate %}
|
||||
<span class="badge text-bg-info mb-1" title="{% trans %}part_lots.expiration_date{% endtrans %}">
|
||||
<i class="fas fa-calendar-alt fa-fw"></i> {{ lot.expirationDate | format_date() }}<br>
|
||||
</span>
|
||||
{% endif %}
|
||||
{% if lot.expired %}
|
||||
<span class="badge text-bg-warning mb-1">
|
||||
{% endif %}
|
||||
{% if lot.expired %}
|
||||
<span class="badge text-bg-warning mb-1">
|
||||
<i class="fas fa-exclamation-circle fa-fw"></i>
|
||||
{% trans %}part_lots.is_expired{% endtrans %}
|
||||
</span>
|
||||
{% endif %}
|
||||
{% if lot.needsRefill %}
|
||||
<span class="badge text-bg-warning mb-1">
|
||||
{% endif %}
|
||||
{% if lot.needsRefill %}
|
||||
<span class="badge text-bg-warning mb-1">
|
||||
<i class="fas fa-dolly fa-fw"></i>
|
||||
{% trans %}part_lots.need_refill{% endtrans %}
|
||||
</span>
|
||||
{% endif %}
|
||||
{% if lot.lastStocktakeAt %}
|
||||
<span class="badge text-bg-secondary" title="{% trans %}part_lot.edit.last_stocktake_at{% endtrans %}">
|
||||
{% endif %}
|
||||
{% if lot.lastStocktakeAt %}
|
||||
<span class="badge text-bg-secondary" title="{% trans %}part_lot.edit.last_stocktake_at{% endtrans %}">
|
||||
<i class="fas fa-clipboard-check fa-fw"></i>
|
||||
{{ lot.lastStocktakeAt | format_datetime("short") }}
|
||||
</span>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</div>
|
||||
</td>
|
||||
<td>
|
||||
<div class="btn-group" role="group">
|
||||
|
||||
@@ -11832,7 +11832,7 @@ Buerklin-API-Authentication-Server:
|
||||
<unit id="WV10ozS" name="update_manager.latest_release">
|
||||
<segment state="translated">
|
||||
<source>update_manager.latest_release</source>
|
||||
<target>update_manager.latest_release</target>
|
||||
<target>Neueste Version</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="pMdT6Ln" name="update_manager.tag">
|
||||
@@ -12078,25 +12078,25 @@ Buerklin-API-Authentication-Server:
|
||||
<unit id="458.UTU" name="update_manager.run_command_to_update">
|
||||
<segment state="translated">
|
||||
<source>update_manager.run_command_to_update</source>
|
||||
<target>update_manager.run_command_to_update</target>
|
||||
<target>Führen Sie den folgenden Befehl in Ihrem Terminal aus, um auf diese Version zu aktualisieren:</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="1iYIZ6C" name="update_manager.log_viewer">
|
||||
<segment state="translated">
|
||||
<source>update_manager.log_viewer</source>
|
||||
<target>update_manager.log_viewer</target>
|
||||
<target>Protokollanzeige</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="AXavng5" name="update_manager.update_log">
|
||||
<segment state="translated">
|
||||
<source>update_manager.update_log</source>
|
||||
<target>update_manager.update_log</target>
|
||||
<target>Update-Protokoll</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id=".QzwEpo" name="update_manager.bytes">
|
||||
<segment state="translated">
|
||||
<source>update_manager.bytes</source>
|
||||
<target>update_manager.bytes</target>
|
||||
<target>Bytes</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="Gt.91s_" name="perm.system.manage_updates">
|
||||
@@ -12108,43 +12108,43 @@ Buerklin-API-Authentication-Server:
|
||||
<unit id="Mw2sya4" name="update_manager.create_backup">
|
||||
<segment state="translated">
|
||||
<source>update_manager.create_backup</source>
|
||||
<target>update_manager.create_backup</target>
|
||||
<target>Erstelle vor dem Update ein Backup (empfohlen)</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="fWGZSZ1" name="update_manager.confirm_update">
|
||||
<segment state="translated">
|
||||
<source>update_manager.confirm_update</source>
|
||||
<target>update_manager.confirm_update</target>
|
||||
<target>Sind Sie sicher, dass Sie Part-DB aktualisieren möchten? Vor dem Update wird ein Backup erstellt.</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="Fashdp." name="update_manager.already_up_to_date">
|
||||
<segment state="translated">
|
||||
<source>update_manager.already_up_to_date</source>
|
||||
<target>update_manager.already_up_to_date</target>
|
||||
<target>Sie verwenden bereits die neueste Version von Part-DB.</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="JPZ9w0l" name="update_manager.progress.title">
|
||||
<segment state="translated">
|
||||
<source>update_manager.progress.title</source>
|
||||
<target>update_manager.progress.title</target>
|
||||
<target>Update-Fortschritt</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="7oAKwee" name="update_manager.progress.updating">
|
||||
<segment state="translated">
|
||||
<source>update_manager.progress.updating</source>
|
||||
<target>update_manager.progress.updating</target>
|
||||
<target>Part-DB wird aktualisiert...</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="ffxDMB4" name="update_manager.progress.completed">
|
||||
<segment state="translated">
|
||||
<source>update_manager.progress.completed</source>
|
||||
<target>update_manager.progress.completed</target>
|
||||
<target>Update abgeschlossen!</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="ZKFaIiJ" name="update_manager.progress.failed">
|
||||
<segment state="translated">
|
||||
<source>update_manager.progress.failed</source>
|
||||
<target>update_manager.progress.failed</target>
|
||||
<target>Update fehlgeschlagen</target>
|
||||
</segment>
|
||||
</unit>
|
||||
<unit id="bSdCWOK" name="update_manager.progress.initializing">
|
||||
|
||||
Reference in New Issue
Block a user