diff --git a/bookwyrm/migrations/0160_auto_20221105_2030.py b/bookwyrm/migrations/0160_auto_20221105_2030.py index 756787d2a..5bbedf55d 100644 --- a/bookwyrm/migrations/0160_auto_20221105_2030.py +++ b/bookwyrm/migrations/0160_auto_20221105_2030.py @@ -25,7 +25,6 @@ class Migration(migrations.Migration): ("complete", "Complete"), ("stopped", "Stopped"), ], - default="pending", max_length=50, null=True, ), diff --git a/bookwyrm/migrations/0161_alter_importjob_status.py b/bookwyrm/migrations/0161_alter_importjob_status.py new file mode 100644 index 000000000..d64b3e27e --- /dev/null +++ b/bookwyrm/migrations/0161_alter_importjob_status.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.15 on 2022-11-05 20:40 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('bookwyrm', '0160_auto_20221105_2030'), + ] + + operations = [ + migrations.AlterField( + model_name='importjob', + name='status', + field=models.CharField(choices=[('pending', 'Pending'), ('active', 'Active'), ('complete', 'Complete'), ('stopped', 'Stopped')], default='pending', max_length=50, null=True), + ), + ] diff --git a/bookwyrm/templates/import/import.html b/bookwyrm/templates/import/import.html index 3757d37ef..a2924703c 100644 --- a/bookwyrm/templates/import/import.html +++ b/bookwyrm/templates/import/import.html @@ -120,17 +120,26 @@ {{ job.updated_date }} {{ job.item_count|intcomma }} - {% if job.complete %} - - {% trans "Completed" %} + + {% if job.status %} + {{ job.status }} + {{ job.status_display }} + {% elif job.complete %} + {% trans "Complete" %} + {% else %} + {% trans "Active" %} + {% endif %} - {% else %} - - {% blocktrans trimmed with percent=job.percent_complete %} - Active, {{ percent }}% complete - {% endblocktrans %} - - {% endif %} {% endfor %}