mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-11-14 04:41:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1171 from bookwyrm-social/import-text

Browse source 
Clarifies wording on pending imports
This commit is contained in:
Mouse Reeve 2021-06-14 12:31:38 -07:00 committed by GitHub
commit d4e2a06092
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
bookwyrm/templates/import_status.html
View file

@ -7,6 +7,7 @@
{% block content %}{% spaceless %}
<div class="block">
<h1 class="title">{% trans "Import Status" %}</h1>
<a href="{% url 'import' %}" class="has-text-weight-normal help subtitle is-link">{% trans "Back to imports" %}</a>
<dl>
<div class="is-flex">
@ -106,7 +107,11 @@
{% endif %}
<div class="block">
{% if job.complete %}
<h2 class="title is-4">{% trans "Successfully imported" %}</h2>
{% else %}
<h2 class="title is-4">{% trans "Import Progress" %}</h2>
{% endif %}
<table class="table">
<tr>
<th>

4
bookwyrm/views/import_data.py
View file

@ -78,13 +78,15 @@ class ImportStatus(View):
def get(self, request, job_id):
"""status of an import job"""
job = models.ImportJob.objects.get(id=job_id)
job = get_object_or_404(models.ImportJob, id=job_id)
if job.user != request.user:
raise PermissionDenied
try:
task = app.AsyncResult(job.task_id)
except ValueError:
task = None
items = job.items.order_by("index").all()
failed_items = [i for i in items if i.fail_reason]
items = [i for i in items if not i.fail_reason]