Merge branch 'main' into list-fixes

This commit is contained in:
Mouse Reeve
2021-04-26 09:44:55 -07:00
152 changed files with 1289 additions and 1289 deletions

View File

@ -24,10 +24,10 @@ from .helpers import get_user_from_username
# pylint: disable=no-self-use
class Lists(View):
""" book list page """
"""book list page"""
def get(self, request):
""" display a book list """
"""display a book list"""
# hide lists with no approved books
lists = (
models.List.objects.annotate(
@ -53,7 +53,7 @@ class Lists(View):
@method_decorator(login_required, name="dispatch")
# pylint: disable=unused-argument
def post(self, request):
""" create a book_list """
"""create a book_list"""
form = forms.ListForm(request.POST)
if not form.is_valid():
return redirect("lists")
@ -63,10 +63,10 @@ class Lists(View):
class UserLists(View):
""" a user's book list page """
"""a user's book list page"""
def get(self, request, username):
""" display a book list """
"""display a book list"""
user = get_user_from_username(request.user, username)
lists = models.List.objects.filter(user=user)
lists = privacy_filter(request.user, lists)
@ -83,10 +83,10 @@ class UserLists(View):
class List(View):
""" book list page """
"""book list page"""
def get(self, request, list_id):
""" display a book list """
"""display a book list"""
book_list = get_object_or_404(models.List, id=list_id)
if not book_list.visible_to_user(request.user):
return HttpResponseNotFound()
@ -172,7 +172,7 @@ class List(View):
@method_decorator(login_required, name="dispatch")
# pylint: disable=unused-argument
def post(self, request, list_id):
""" edit a list """
"""edit a list"""
book_list = get_object_or_404(models.List, id=list_id)
form = forms.ListForm(request.POST, instance=book_list)
if not form.is_valid():
@ -182,11 +182,11 @@ class List(View):
class Curate(View):
""" approve or discard list suggestsions """
"""approve or discard list suggestsions"""
@method_decorator(login_required, name="dispatch")
def get(self, request, list_id):
""" display a pending list """
"""display a pending list"""
book_list = get_object_or_404(models.List, id=list_id)
if not book_list.user == request.user:
# only the creater can curate the list
@ -202,7 +202,7 @@ class Curate(View):
@method_decorator(login_required, name="dispatch")
# pylint: disable=unused-argument
def post(self, request, list_id):
""" edit a book_list """
"""edit a book_list"""
book_list = get_object_or_404(models.List, id=list_id)
suggestion = get_object_or_404(models.ListItem, id=request.POST.get("item"))
approved = request.POST.get("approved") == "true"
@ -228,7 +228,7 @@ class Curate(View):
@require_POST
def add_book(request):
""" put a book on a list """
"""put a book on a list"""
book_list = get_object_or_404(models.List, id=request.POST.get("list"))
if not book_list.visible_to_user(request.user):
return HttpResponseNotFound()
@ -275,7 +275,7 @@ def add_book(request):
@require_POST
def remove_book(request, list_id):
""" remove a book from a list """
"""remove a book from a list"""
with transaction.atomic():
book_list = get_object_or_404(models.List, id=list_id)
item = get_object_or_404(models.ListItem, id=request.POST.get("item"))
@ -343,7 +343,7 @@ def set_book_position(request, list_item_id):
def increment_order_in_reverse(
book_list_id: int, start: int, end: Optional[int] = None
):
""" increase the order nu,ber for every item in a list """
"""increase the order nu,ber for every item in a list"""
try:
book_list = models.List.objects.get(id=book_list_id)
except models.List.DoesNotExist:
@ -359,7 +359,7 @@ def increment_order_in_reverse(
@transaction.atomic
def decrement_order(book_list_id, start, end):
""" decrement the order value for every item in a list """
"""decrement the order value for every item in a list"""
try:
book_list = models.List.objects.get(id=book_list_id)
except models.List.DoesNotExist:
@ -374,7 +374,7 @@ def decrement_order(book_list_id, start, end):
@transaction.atomic
def normalize_book_list_ordering(book_list_id, start=0, add_offset=0):
""" gives each book in a list the proper sequential order number """
"""gives each book in a list the proper sequential order number"""
try:
book_list = models.List.objects.get(id=book_list_id)
except models.List.DoesNotExist: