mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2025-02-01 03:42:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1377 from bookwyrm-social/fix-imported-read-dates

Browse source 
Fix imported read dates
This commit is contained in:
Mouse Reeve 2021-09-07 18:33:43 -07:00 committed by GitHub
commit eb93abceb2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
bookwyrm/models/import_job.py
View file

@ -174,6 +174,7 @@ class ImportItem(models.Model):
if start_date and start_date is not None and not self.date_read: if start_date and start_date is not None and not self.date_read:
return [ReadThrough(start_date=start_date)] return [ReadThrough(start_date=start_date)]
if self.date_read: if self.date_read:
start_date = start_date if start_date < self.date_read else None
return [ return [
ReadThrough( ReadThrough(
start_date=start_date, start_date=start_date,

2
bookwyrm/templates/import_status.html
View file

@ -40,7 +40,7 @@
<div class="block"> <div class="block">
<h2 class="title is-4">{% trans "Failed to load" %}</h2> <h2 class="title is-4">{% trans "Failed to load" %}</h2>
{% if not job.retry %} {% if not job.retry %}
<form name="retry" action="/import/{{ job.id }}" method="post"> <form name="retry" action="/import/{{ job.id }}" method="post" class="box">
{% csrf_token %} {% csrf_token %}
{% with failed_count=failed_items|length %} {% with failed_count=failed_items|length %}