X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/49e1a0fdfaa15ac3cccb84fd993d68a72cc2a0b9..85b88321baaf99ad7133cbd195018d7ed1cab165:/platforma/urls.py diff --git a/platforma/urls.py b/platforma/urls.py old mode 100755 new mode 100644 index 1abc8992..9b4b1a28 --- a/platforma/urls.py +++ b/platforma/urls.py @@ -6,18 +6,15 @@ 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'), + url(r'^(?P[^/]+)/history$', 'wiki.views.document_history'), + url(r'^(?P[^/]+)/diff/(?P\d+)/(?P\d+)$', 'wiki.views.document_diff'), # 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')),