X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/49e1a0fdfaa15ac3cccb84fd993d68a72cc2a0b9..ea335ef160fbe5f8488e8bef51a4706163ba9964:/platforma/urls.py diff --git a/platforma/urls.py b/platforma/urls.py old mode 100755 new mode 100644 index 1abc8992..d875a6ea --- a/platforma/urls.py +++ b/platforma/urls.py @@ -6,18 +6,10 @@ from django.conf import settings admin.autodiscover() -if 'cas_consumer' in settings.INSTALLED_APPS: - auth_views = 'cas_consumer.views' -else: - auth_views = 'django.contrib.auth.views' - urlpatterns = patterns('', - url(r'^$', 'wiki.views.document_list'), - url(r'^gallery/(?P[^/]+)$', 'wiki.views.document_gallery'), - # Auth - url(r'^accounts/login/$', auth_views + '.login', name = 'login'), - url(r'^accounts/logout/$', auth_views + '.logout', name = 'logout'), + url(r'^accounts/login/$', 'django_cas.views.login', name='login'), + url(r'^accounts/logout/$', 'django_cas.views.logout', name='logout'), # Admin panel (r'^admin/filebrowser/', include('filebrowser.urls')), @@ -31,6 +23,5 @@ urlpatterns = patterns('', {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}), url(r'^%s(?P.+)$' % settings.STATIC_URL[1:], 'django.views.static.serve', {'document_root': settings.STATIC_ROOT, 'show_indexes': True}), - - url(r'^(?P[^/]+)$', 'wiki.views.document_detail'), + url(r'^', include('wiki.urls')), )