X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/15dec706694c3afc006713be0fabb4973a6c2946..8a9226b9c80c99c82702fba212f7a7241dc14c7e:/src/redakcja/urls.py diff --git a/src/redakcja/urls.py b/src/redakcja/urls.py index 1fe11d88..fe2193e7 100644 --- a/src/redakcja/urls.py +++ b/src/redakcja/urls.py @@ -1,38 +1,50 @@ -# -*- coding: utf-8 -*- - -from django.conf.urls import include, url +# This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later. +# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. +# +from django.conf.urls import url +from django.urls import include, path from django.contrib import admin from django.conf import settings from django.conf.urls.static import static from django.contrib.staticfiles.urls import staticfiles_urlpatterns from django.views.generic import RedirectView -import django_cas.views +import django_cas_ng.views -admin.autodiscover() urlpatterns = [ - # Auth - url(r'^accounts/login/$', django_cas.views.login, name='login'), - url(r'^accounts/logout/$', django_cas.views.logout, name='logout'), - url(r'^admin/login/$', django_cas.views.login, name='login'), - url(r'^admin/logout/$', django_cas.views.logout, name='logout'), + #url(r'^admin/login/$', django_cas_ng.views.login, name='login'), + #url(r'^admin/logout/$', django_cas_ng.views.logout, name='logout'), # Admin panel url(r'^admin/doc/', include('django.contrib.admindocs.urls')), - url(r'^admin/', include(admin.site.urls)), - - url(r'^$', RedirectView.as_view(url= '/documents/', permanent=False)), - url(r'^documents/', include('catalogue.urls')), + url(r'^admin/', admin.site.urls), + path('catalogue/', include('catalogue.urls')), + url(r'^$', RedirectView.as_view(url='/documents/', permanent=False)), + url(r'^documents/', include('documents.urls')), url(r'^apiclient/', include('apiclient.urls')), url(r'^editor/', include('wiki.urls')), url(r'^images/', include('wiki_img.urls')), url(r'^cover/', include('cover.urls')), ] + +if settings.CAS_SERVER_URL: + urlpatterns += [ + url(r'^accounts/login/$', django_cas_ng.views.LoginView.as_view(), name='cas_ng_login'), + url(r'^accounts/logout/$', django_cas_ng.views.LogoutView.as_view(), name='logout'), + ] +else: + import django.contrib.auth.views + urlpatterns += [ + url(r'^accounts/login/$', django.contrib.auth.views.LoginView.as_view(), name='cas_ng_login'), + url(r'^accounts/', include('django.contrib.auth.urls')), + ] + + if settings.DEBUG: urlpatterns += staticfiles_urlpatterns() urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) import debug_toolbar - urlpatterns += (url(r'^__debug__/', include(debug_toolbar.urls))), + urlpatterns += [url(r'^__debug__/', include(debug_toolbar.urls))]