Converts create readthrough to modal
This commit is contained in:
@ -88,7 +88,7 @@ from .list import Lists, SavedLists, List, Curate, UserLists
|
||||
from .list import save_list, unsave_list, delete_list, unsafe_embed_list
|
||||
from .notifications import Notifications
|
||||
from .outbox import Outbox
|
||||
from .reading import create_readthrough, delete_readthrough, delete_progressupdate
|
||||
from .reading import CreateReadThrough, delete_readthrough, delete_progressupdate
|
||||
from .reading import ReadingStatus
|
||||
from .rss_feed import RssFeed
|
||||
from .search import Search
|
||||
|
@ -9,16 +9,16 @@ from django.utils.decorators import method_decorator
|
||||
from django.views import View
|
||||
from django.views.decorators.http import require_POST
|
||||
|
||||
from bookwyrm import models
|
||||
from bookwyrm import forms, models
|
||||
from bookwyrm.views.shelf.shelf_actions import unshelve
|
||||
from .status import CreateStatus
|
||||
from .helpers import get_edition, handle_reading_status, is_api_request
|
||||
from .helpers import load_date_in_user_tz_as_utc
|
||||
|
||||
|
||||
@method_decorator(login_required, name="dispatch")
|
||||
# pylint: disable=no-self-use
|
||||
# pylint: disable=too-many-return-statements
|
||||
@method_decorator(login_required, name="dispatch")
|
||||
class ReadingStatus(View):
|
||||
"""consider reading a book"""
|
||||
|
||||
@ -115,6 +115,35 @@ class ReadingStatus(View):
|
||||
return redirect(referer)
|
||||
|
||||
|
||||
@method_decorator(login_required, name="dispatch")
|
||||
class CreateReadThrough(View):
|
||||
"""Add new read dates"""
|
||||
def get(self, request):
|
||||
"""standalone form in case of errors"""
|
||||
|
||||
|
||||
def post(self, request):
|
||||
"""can't use the form normally because the dates are too finnicky"""
|
||||
print("hi")
|
||||
normalized_post = request.POST.copy()
|
||||
print(normalized_post)
|
||||
|
||||
normalized_post["start_date"] = load_date_in_user_tz_as_utc(
|
||||
request.POST.get("start_date"), request.user
|
||||
)
|
||||
normalized_post["finish_date"] = load_date_in_user_tz_as_utc(
|
||||
request.POST.get("finish_date"), request.user
|
||||
)
|
||||
form = forms.ReadThroughForm(normalized_post)
|
||||
if not form.is_valid():
|
||||
print(form.errors)
|
||||
# TODO error handling
|
||||
return ""
|
||||
form.save()
|
||||
return redirect("book", request.POST.get("book"))
|
||||
|
||||
|
||||
|
||||
@transaction.atomic
|
||||
def update_readthrough_on_shelve(
|
||||
user, annotated_book, status, start_date=None, finish_date=None
|
||||
@ -155,28 +184,6 @@ def delete_readthrough(request):
|
||||
readthrough.delete()
|
||||
return redirect(request.headers.get("Referer", "/"))
|
||||
|
||||
|
||||
@login_required
|
||||
@require_POST
|
||||
def create_readthrough(request):
|
||||
"""can't use the form because the dates are too finnicky"""
|
||||
book = get_object_or_404(models.Edition, id=request.POST.get("book"))
|
||||
|
||||
start_date = load_date_in_user_tz_as_utc(
|
||||
request.POST.get("start_date"), request.user
|
||||
)
|
||||
finish_date = load_date_in_user_tz_as_utc(
|
||||
request.POST.get("finish_date"), request.user
|
||||
)
|
||||
models.ReadThrough.objects.create(
|
||||
user=request.user,
|
||||
book=book,
|
||||
start_date=start_date,
|
||||
finish_date=finish_date,
|
||||
)
|
||||
return redirect("book", book.id)
|
||||
|
||||
|
||||
@login_required
|
||||
@require_POST
|
||||
def delete_progressupdate(request):
|
||||
|
Reference in New Issue
Block a user