Editor fixes

[redakcja.git] / apps / catalogue / urls.py

diff --git a/apps/catalogue/urls.py b/apps/catalogue/urls.py
index feebb3e..e74f916 100644 (file)
--- a/apps/catalogue/urls.py
+++ b/apps/catalogue/urls.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8
 # -*- coding: utf-8

-from django.conf.urls.defaults import *
-from django.contrib.auth.decorators import permission_required
+from django.conf.urls import patterns, url
+from django.contrib.auth.decorators import permission_required, login_required

 from django.views.generic import RedirectView
 from catalogue.feeds import PublishTrackFeed
 from django.views.generic import RedirectView
 from catalogue.feeds import PublishTrackFeed

-from catalogue.views import GalleryView
+from catalogue.views import GalleryView, GalleryPackageView

 
 
 urlpatterns = patterns('catalogue.views',
 
 
 urlpatterns = patterns('catalogue.views',


@@ -30,8 +30,11 @@ urlpatterns = patterns('catalogue.views',
 
     url(r'^book/(?P<slug>[^/]+)/$', 'book', name="catalogue_book"),
     url(r'^book/(?P<slug>[^/]+)/gallery/$',
 
     url(r'^book/(?P<slug>[^/]+)/$', 'book', name="catalogue_book"),
     url(r'^book/(?P<slug>[^/]+)/gallery/$',

-            permission_required('catalogue.change_book')(GalleryView.as_view()),
+            login_required()(GalleryView.as_view()),

             name="catalogue_book_gallery"),
             name="catalogue_book_gallery"),

+    url(r'^book/(?P<slug>[^/]+)/gallery/package$',
+            permission_required('catalogue.change_book')(GalleryPackageView.as_view()),
+            name="catalogue_book_gallery_package"),

     url(r'^book/(?P<slug>[^/]+)/xml$', 'book_xml', name="catalogue_book_xml"),
     url(r'^book/(?P<slug>[^/]+)/txt$', 'book_txt', name="catalogue_book_txt"),
     url(r'^book/(?P<slug>[^/]+)/html$', 'book_html', name="catalogue_book_html"),
     url(r'^book/(?P<slug>[^/]+)/xml$', 'book_xml', name="catalogue_book_xml"),
     url(r'^book/(?P<slug>[^/]+)/txt$', 'book_txt', name="catalogue_book_txt"),
     url(r'^book/(?P<slug>[^/]+)/html$', 'book_html', name="catalogue_book_html"),