gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge remote-tracking branch 'parent/main' into upstream-20240422

Browse source
This commit is contained in:
KMY 2024-04-22 08:58:37 +09:00
commit 44f4a93430
100 changed files with 770 additions and 441 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/views/settings/imports/index.html.haml
View file

@ -49,7 +49,7 @@
%tr
%td= t("imports.types.#{import.type}")
%td
- if import.unconfirmed?
- if import.state_unconfirmed?
= link_to t("imports.states.#{import.state}"), settings_import_path(import)
- else
= t("imports.states.#{import.state}")
@ -59,7 +59,7 @@
%td
- num_failed = import.processed_items - import.imported_items
- if num_failed.positive?
- if import.finished?
- if import.state_finished?
= link_to num_failed, failures_settings_import_path(import, format: 'csv')
- else
= num_failed