added link to PR, some cleaning

diff --git a/apps/api/handlers.py b/apps/api/handlers.py
index ce29c61..09370fd 100644 (file)
--- a/apps/api/handlers.py
+++ b/apps/api/handlers.py
@@ -5,30 +5,14 @@
 from functools import wraps
 
 from django.shortcuts import get_object_or_404
 from functools import wraps
 
 from django.shortcuts import get_object_or_404

-from django.contrib.auth.decorators import login_required, permission_required
-from piston.handler import BaseHandler
+from piston.handler import AnonymousBaseHandler, BaseHandler

 from piston.utils import rc, validate
 from catalogue.models import Book
 from catalogue.forms import BookImportForm
 
 
 from piston.utils import rc, validate
 from catalogue.models import Book
 from catalogue.forms import BookImportForm
 
 

-def method_decorator(function_decorator):
-    """
-        Turns a function(*args, **kwargs) decorator into an
-        equivalent decorator for method(self, *args, **kwargs).
-    """
-    @wraps(function_decorator)
-    def decorator(method):
-        @wraps(method)
-        def decorated_method(self, *args, **kwargs):
-            def method_as_function(*fargs, **fkwargs):
-                return method(self, *fargs, **fkwargs)
-            return function_decorator(method_as_function)(*args, **kwargs)
-        return decorated_method
-    return decorator

 
 

-
-class BookHandler(BaseHandler):
+class AnonymousBooksHandler(AnonymousBaseHandler):

     model = Book
     fields = ('slug', 'title')
 
     model = Book
     fields = ('slug', 'title')
 


@@ -38,8 +22,16 @@ class BookHandler(BaseHandler):
         else:
             return Book.objects.all()
 
         else:
             return Book.objects.all()
 

-    @method_decorator(permission_required('catalogue.add_book'))
+
+class BooksHandler(BaseHandler):
+    model = Book
+    fields = ('slug', 'title')
+    anonymous = AnonymousBooksHandler
+

     def create(self, request):
     def create(self, request):

+        if not request.user.has_perm('catalogue.add_book'):
+            return rc.FORBIDDEN
+

         form = BookImportForm(request.POST, request.FILES)
         if form.is_valid():
             form.save()
         form = BookImportForm(request.POST, request.FILES)
         if form.is_valid():
             form.save()

diff --git a/apps/api/urls.py b/apps/api/urls.py
index d6f0dbf..c060322 100644 (file)
--- a/apps/api/urls.py
+++ b/apps/api/urls.py
@@ -3,11 +3,11 @@ from django.conf.urls.defaults import *
 from piston.resource import Resource
 from piston.authentication import OAuthAuthentication
 
 from piston.resource import Resource
 from piston.authentication import OAuthAuthentication
 

-from api.handlers import BookHandler
+from api.handlers import BooksHandler

 
 
 auth = OAuthAuthentication(realm="Wolne Lektury")
 
 
 auth = OAuthAuthentication(realm="Wolne Lektury")

-book_resource = Resource(handler=BookHandler, authentication=auth)
+book_resource = Resource(handler=BooksHandler, authentication=auth)

 
 
 urlpatterns = patterns('',  
 
 
 urlpatterns = patterns('',  

diff --git a/wolnelektury/templates/catalogue/book_detail.html b/wolnelektury/templates/catalogue/book_detail.html
index 5454800..99bbb39 100644 (file)
--- a/wolnelektury/templates/catalogue/book_detail.html
+++ b/wolnelektury/templates/catalogue/book_detail.html
@@ -157,6 +157,9 @@
                 {% if extra_info.source_url %}
                 <li><a href="{{ extra_info.source_url }}">{% trans "Source of the book" %}</a></li>
                 {% endif %}
                 {% if extra_info.source_url %}
                 <li><a href="{{ extra_info.source_url }}">{% trans "Source of the book" %}</a></li>
                 {% endif %}

+                {% if extra_info.about %}
+                <li><a href="{{ extra_info.about }}">{% trans "Book on the Editor's Platform" %}</a></li>
+                {% endif %}

                 {% if book.gazeta_link %}
                 <li><a href="{{ book.gazeta_link }}">{% trans "Book description on Lektury.Gazeta.pl" %}</a></li>
                 {% endif %}
                 {% if book.gazeta_link %}
                 <li><a href="{{ book.gazeta_link }}">{% trans "Book description on Lektury.Gazeta.pl" %}</a></li>
                 {% endif %}