Some forgotten Django 1.9 fixes.

[wolnelektury.git] / src / social / views.py

diff --git a/src/social/views.py b/src/social/views.py
index 49c9b70..757b5a2 100644 (file)
--- a/src/social/views.py
+++ b/src/social/views.py
@@ -13,7 +13,6 @@ from catalogue.models import Book
 from ssify import ssi_included
 from social import forms
 from .models import Cite
 from ssify import ssi_included
 from social import forms
 from .models import Cite

-from social.utils import get_set, likes, set_sets

 
 
 # ====================
 
 
 # ====================


@@ -26,9 +25,8 @@ def like_book(request, slug):
     if not request.user.is_authenticated():
         return HttpResponseForbidden('Login required.')
     book = get_object_or_404(Book, slug=slug)
     if not request.user.is_authenticated():
         return HttpResponseForbidden('Login required.')
     book = get_object_or_404(Book, slug=slug)

-    if not likes(request.user, book):
-        tag = get_set(request.user, '')
-        set_sets(request.user, book, [tag])
+
+    book.like(request.user)

 
     if request.is_ajax():
         return JsonResponse({"success": True, "msg": "ok", "like": True})
 
     if request.is_ajax():
         return JsonResponse({"success": True, "msg": "ok", "like": True})


@@ -36,10 +34,25 @@ def like_book(request, slug):
         return redirect(book)
 
 
         return redirect(book)
 
 

+@require_POST
+def unlike_book(request, slug):
+    if not request.user.is_authenticated():
+        return HttpResponseForbidden('Login required.')
+    book = get_object_or_404(Book, slug=slug)
+
+    book.unlike(request.user)
+
+    if request.is_ajax():
+        return JsonResponse({"success": True, "msg": "ok", "like": False})
+    else:
+        return redirect(book)
+
+

 @login_required
 def my_shelf(request):
 @login_required
 def my_shelf(request):

-    books = Book.tagged.with_any(request.user.tag_set.all())
-    return render(request, 'social/my_shelf.html', locals())
+    return render(request, 'social/my_shelf.html', {
+        'books': Book.tagged.with_any(request.user.tag_set.all())
+    })

 
 
 class ObjectSetsFormView(AjaxableFormView):
 
 
 class ObjectSetsFormView(AjaxableFormView):


@@ -59,20 +72,6 @@ class ObjectSetsFormView(AjaxableFormView):
         return (obj, request.user), {}
 
 
         return (obj, request.user), {}
 
 

-@require_POST
-def unlike_book(request, slug):
-    if not request.user.is_authenticated():
-        return HttpResponseForbidden('Login required.')
-    book = get_object_or_404(Book, slug=slug)
-    if likes(request.user, book):
-        set_sets(request.user, book, [])
-
-    if request.is_ajax():
-        return JsonResponse({"success": True, "msg": "ok", "like": False})
-    else:
-        return redirect(book)
-
-

 @ssi_included
 def cite(request, pk, main=False):
     cite = get_object_or_404(Cite, pk=pk)
 @ssi_included
 def cite(request, pk, main=False):
     cite = get_object_or_404(Cite, pk=pk)