Merge branch 'main' into move
This commit is contained in:
commit
088b9ab555
16 changed files with 186 additions and 67 deletions
|
@ -5,6 +5,7 @@ from django.shortcuts import get_object_or_404, redirect
|
|||
from django.template.response import TemplateResponse
|
||||
from django.utils.decorators import method_decorator
|
||||
from django.views import View
|
||||
from django.views.decorators.http import require_POST
|
||||
|
||||
from bookwyrm import forms, models
|
||||
from bookwyrm.settings import PAGE_LENGTH
|
||||
|
@ -108,6 +109,7 @@ class EditAnnouncement(View):
|
|||
|
||||
@login_required
|
||||
@permission_required("bookwyrm.edit_instance_settings", raise_exception=True)
|
||||
@require_POST
|
||||
def delete_announcement(_, announcement_id):
|
||||
"""delete announcement"""
|
||||
announcement = get_object_or_404(models.Announcement, id=announcement_id)
|
||||
|
|
|
@ -32,6 +32,9 @@ class EditBook(View):
|
|||
def get(self, request, book_id):
|
||||
"""info about a book"""
|
||||
book = get_edition(book_id)
|
||||
# This doesn't update the sort title, just pre-populates it in the form
|
||||
if book.sort_title in ["", None]:
|
||||
book.sort_title = book.guess_sort_title()
|
||||
if not book.description:
|
||||
book.description = book.parent_work.description
|
||||
data = {"book": book, "form": forms.EditionForm(instance=book)}
|
||||
|
@ -40,6 +43,7 @@ class EditBook(View):
|
|||
def post(self, request, book_id):
|
||||
"""edit a book cool"""
|
||||
book = get_object_or_404(models.Edition, id=book_id)
|
||||
|
||||
form = forms.EditionForm(request.POST, request.FILES, instance=book)
|
||||
|
||||
data = {"book": book, "form": form}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue