From f0609e6ff352d83437bee239229c4521b41b4ef8 Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Sat, 4 Apr 2020 13:46:10 -0700 Subject: [PATCH] SMall fixes for update form and ol connector --- fedireads/connectors/openlibrary.py | 11 ++++------- fedireads/templates/edit_book.html | 4 +++- fedireads/views.py | 2 ++ 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/fedireads/connectors/openlibrary.py b/fedireads/connectors/openlibrary.py index e99cf99d..65e0fe12 100644 --- a/fedireads/connectors/openlibrary.py +++ b/fedireads/connectors/openlibrary.py @@ -48,13 +48,11 @@ class Connector(AbstractConnector): if you give a work key, it should give you the default edition, annotated with work data. ''' - try: - book = models.Book.objects.select_subclasses().filter( - openlibrary_key=olkey - ).first() + book = models.Book.objects.select_subclasses().filter( + openlibrary_key=olkey + ).first() + if book: return book - except ObjectDoesNotExist: - pass # no book was found, so we start creating a new one model = models.Edition if re.match(r'^OL\d+W$', olkey): @@ -122,7 +120,6 @@ class Connector(AbstractConnector): if not data.get('authors') and book.parent_work.authors.count(): book.authors.set(book.parent_work.authors.all()) - if book.sync_cover and data.get('covers') and len(data['covers']): book.cover.save(*self.get_cover(data['covers'][0]), save=True) diff --git a/fedireads/templates/edit_book.html b/fedireads/templates/edit_book.html index 52ab6fb8..ed641482 100644 --- a/fedireads/templates/edit_book.html +++ b/fedireads/templates/edit_book.html @@ -59,12 +59,14 @@

{{ form.sort_title }}

{{ form.subtitle }}

{{ form.description }}

-

{{ form.language }}

{{ form.series }}

{{ form.series_number }}

{{ form.first_published_date }}

{{ form.published_date }}

+
+ +
{% endblock %} diff --git a/fedireads/views.py b/fedireads/views.py index bc5efb9a..a4b5d70a 100644 --- a/fedireads/views.py +++ b/fedireads/views.py @@ -426,6 +426,8 @@ def book_page(request, book_identifier, tab='friends'): def edit_book_page(request, book_identifier): ''' info about a book ''' book = books_manager.get_or_create_book(book_identifier) + if not book.description: + book.description = book.parent_work.description data = { 'book': book, 'form': forms.EditionForm(instance=book)