More fixes in Filebrowser.

[redakcja.git] / platforma / urls.py

diff --git a/platforma/urls.py b/platforma/urls.py
index cfa2300..1abc899 100755 (executable)
--- a/platforma/urls.py
+++ b/platforma/urls.py
@@ -5,30 +5,20 @@ from django.contrib import admin
 from django.conf import settings
 
 admin.autodiscover()
 from django.conf import settings
 
 admin.autodiscover()

-PATH_SEC = r"(?P<path>[^/]+)"
-PATH_END = PATH_SEC + "/$"
-
-
-
-urlpatterns = patterns('')

 
 if 'cas_consumer' in settings.INSTALLED_APPS:
 
 if 'cas_consumer' in settings.INSTALLED_APPS:

-    urlpatterns += patterns('',
-        # django-cas-consumer
-        url(r'^accounts/login/$', 'cas_consumer.views.login', name = 'login'),
-        url(r'^accounts/logout/$', 'cas_consumer.views.logout', name = 'logout'),
-    )
+    auth_views = 'cas_consumer.views'

 else:
 else:

-    urlpatterns += patterns('',
-        # Django auth
-        url(r'^accounts/login/$', 'django.contrib.auth.views.login', {'redirect_field_name': 'next'}, name = 'login'),
-        url(r'^accounts/logout/$', 'django.contrib.auth.views.logout', {'next_page': '/'}, name = 'logout'),
-    )
+    auth_views = 'django.contrib.auth.views'

 
 

-urlpatterns += patterns('',
+urlpatterns = patterns('',

     url(r'^$', 'wiki.views.document_list'),
     url(r'^gallery/(?P<directory>[^/]+)$', 'wiki.views.document_gallery'),
 
     url(r'^$', 'wiki.views.document_list'),
     url(r'^gallery/(?P<directory>[^/]+)$', 'wiki.views.document_gallery'),
 

+    # Auth
+    url(r'^accounts/login/$', auth_views + '.login', name = 'login'),
+    url(r'^accounts/logout/$', auth_views + '.logout', name = 'logout'),
+

     # Admin panel
     (r'^admin/filebrowser/', include('filebrowser.urls')),
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),
     # Admin panel
     (r'^admin/filebrowser/', include('filebrowser.urls')),
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),


@@ -43,6 +33,4 @@ urlpatterns += patterns('',
         {'document_root': settings.STATIC_ROOT, 'show_indexes': True}),
 
     url(r'^(?P<name>[^/]+)$', 'wiki.views.document_detail'),
         {'document_root': settings.STATIC_ROOT, 'show_indexes': True}),
 
     url(r'^(?P<name>[^/]+)$', 'wiki.views.document_detail'),

-

 )
 )

-