mirrors/bookwyrm
1
0
Fork 1
mirror of https://github.com/bookwyrm-social/bookwyrm.git synced 2024-12-23 08:36:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #840 from mouse-reeve/cover-error-messaging

Browse source 
Adds error messaging for invalid cover urls
This commit is contained in:
Mouse Reeve 2021-04-01 07:25:50 -07:00 committed by GitHub
commit 91955987ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
bookwyrm/templates/book/book.html
View file

@ -49,6 +49,9 @@
{% trans "Add cover" as button_text %} {% trans "Add cover" as button_text %}
{% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="add-cover" controls_uid=book.id focus="modal-title-add-cover" class="is-small" %} {% include 'snippets/toggle/toggle_button.html' with text=button_text controls_text="add-cover" controls_uid=book.id focus="modal-title-add-cover" class="is-small" %}
{% include 'book/cover_modal.html' with book=book controls_text="add-cover" controls_uid=book.id %} {% include 'book/cover_modal.html' with book=book controls_text="add-cover" controls_uid=book.id %}
{% if request.GET.cover_error %}
<p class="help is-danger">{% trans "Failed to load cover" %}</p>
{% endif %}
</div> </div>
{% endif %} {% endif %}

9
bookwyrm/views/books.py
View file

@ -289,18 +289,19 @@ def upload_cover(request, book_id):
url = request.POST.get("cover-url") url = request.POST.get("cover-url")
if url: if url:
image = set_cover_from_url(url) image = set_cover_from_url(url)
book.cover.save(*image) if image:
book.cover.save(*image)
return redirect("/book/%d" % book.id) return redirect("{:s}?cover_error=True".format(book.local_path))
form = forms.CoverForm(request.POST, request.FILES, instance=book) form = forms.CoverForm(request.POST, request.FILES, instance=book)
if not form.is_valid() or not form.files.get("cover"): if not form.is_valid() or not form.files.get("cover"):
return redirect("/book/%d" % book.id) return redirect(book.local_path)
book.cover = form.files["cover"] book.cover = form.files["cover"]
book.save() book.save()
return redirect("/book/%s" % book.id) return redirect(book.local_path)
def set_cover_from_url(url): def set_cover_from_url(url):