Remove machina, remove default cache config, add some upgrades and compatibility...

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

diff --git a/src/social/views.py b/src/social/views.py
index 15f01bf..b7c8233 100644 (file)
--- a/src/social/views.py
+++ b/src/social/views.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #


@@ -10,10 +9,7 @@ from django.views.decorators.http import require_POST
 from ajaxable.utils import AjaxableFormView
 
 from catalogue.models import Book
 from ajaxable.utils import AjaxableFormView
 
 from catalogue.models import Book

-from ssify import ssi_included

 from social import forms
 from social import forms

-from .models import Cite
-from social.utils import get_set, likes, set_sets

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


@@ -23,12 +19,11 @@ from social.utils import get_set, likes, set_sets
 
 @require_POST
 def like_book(request, slug):
 
 @require_POST
 def like_book(request, slug):

-    if not request.user.is_authenticated():
+    if not request.user.is_authenticated:

         return HttpResponseForbidden('Login required.')
     book = get_object_or_404(Book, slug=slug)
         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,6 +31,20 @@ 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):
     return render(request, 'social/my_shelf.html', {
 @login_required
 def my_shelf(request):
     return render(request, 'social/my_shelf.html', {


@@ -58,34 +67,3 @@ class ObjectSetsFormView(AjaxableFormView):
 
     def form_args(self, request, obj):
         return (obj, request.user), {}
 
     def form_args(self, request, obj):
         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)
-    return render(request, 'social/cite_promo.html', {
-        'main': main,
-        'cite': cite,
-    })
-
-
-@ssi_included(use_lang=False)
-def cite_info(request, pk):
-    cite = get_object_or_404(Cite, pk=pk)
-    return render(request, 'social/cite_info.html', {
-        'cite': cite,
-    })