From 287b5603d6a42bfeeb578e1456a5d8e46f5827cb Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 18 Mar 2022 19:11:58 -0700 Subject: [PATCH 1/2] Fixes progress updates --- bookwyrm/forms/forms.py | 2 +- bookwyrm/templates/readthrough/readthrough_modal.html | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/bookwyrm/forms/forms.py b/bookwyrm/forms/forms.py index 8af8fb81..9d8f9f39 100644 --- a/bookwyrm/forms/forms.py +++ b/bookwyrm/forms/forms.py @@ -45,7 +45,7 @@ class ReportForm(CustomForm): class ReadThroughForm(CustomForm): def clean(self): - """make sure the email isn't in use by a registered user""" + """don't let readthroughs end before they start""" cleaned_data = super().clean() start_date = cleaned_data.get("start_date") finish_date = cleaned_data.get("finish_date") diff --git a/bookwyrm/templates/readthrough/readthrough_modal.html b/bookwyrm/templates/readthrough/readthrough_modal.html index 0f03d938..e7fffb19 100644 --- a/bookwyrm/templates/readthrough/readthrough_modal.html +++ b/bookwyrm/templates/readthrough/readthrough_modal.html @@ -17,7 +17,14 @@ {% endblock %} {% block modal-form-open %} -
+ {% endblock %} {% block modal-body %} From 55dc998d032cac4467f5baa9399c1685bc627df9 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Fri, 18 Mar 2022 19:20:43 -0700 Subject: [PATCH 2/2] Retain start date when updating from modal --- .../templates/snippets/reading_modals/progress_update_modal.html | 1 + 1 file changed, 1 insertion(+) diff --git a/bookwyrm/templates/snippets/reading_modals/progress_update_modal.html b/bookwyrm/templates/snippets/reading_modals/progress_update_modal.html index 919d2100..e0be1588 100644 --- a/bookwyrm/templates/snippets/reading_modals/progress_update_modal.html +++ b/bookwyrm/templates/snippets/reading_modals/progress_update_modal.html @@ -10,6 +10,7 @@ {% csrf_token %} + {% endblock %} {% block reading-dates %}