diff --git a/bookwyrm/templates/settings/imports/complete_import_modal.html b/bookwyrm/templates/settings/imports/complete_import_modal.html index 64d571764..af896ab60 100644 --- a/bookwyrm/templates/settings/imports/complete_import_modal.html +++ b/bookwyrm/templates/settings/imports/complete_import_modal.html @@ -1,7 +1,7 @@ {% extends 'components/modal.html' %} {% load i18n %} -{% block modal-title %}{% trans "Mark import as complete?" %}{% endblock %} +{% block modal-title %}{% trans "Stop import?" %}{% endblock %} {% block modal-body %} {% trans "This action cannot be un-done" %} diff --git a/bookwyrm/templates/settings/imports/imports.html b/bookwyrm/templates/settings/imports/imports.html index b027e6a4d..f230eeab0 100644 --- a/bookwyrm/templates/settings/imports/imports.html +++ b/bookwyrm/templates/settings/imports/imports.html @@ -27,11 +27,6 @@
- {% if status == "active" %} -
-

{% trans "Marking an import as complete will not stop it." %}

-
- {% endif %} {% url 'settings-imports' as url %} @@ -82,7 +77,7 @@ {% if status == "active" %} {% endif %} diff --git a/bookwyrm/views/admin/imports.py b/bookwyrm/views/admin/imports.py index ccba4f976..27c4a178e 100644 --- a/bookwyrm/views/admin/imports.py +++ b/bookwyrm/views/admin/imports.py @@ -40,6 +40,5 @@ class ImportList(View): def post(self, request, import_id): """Mark an import as complete""" import_job = get_object_or_404(models.ImportJob, id=import_id) - import_job.complete = True - import_job.save() + import_job.stop_job() return redirect("settings-imports")
{% join "complete" import.id as modal_id %} - + {% include "settings/imports/complete_import_modal.html" with id=modal_id %}