X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/56145861cf5fa01c5fbb429d40242e0a16189ed1..df341bdd09208d2b0f84060454cc0000df19deba:/src/redakcja/urls.py diff --git a/src/redakcja/urls.py b/src/redakcja/urls.py index 2fb2d39d..0e4dceab 100644 --- a/src/redakcja/urls.py +++ b/src/redakcja/urls.py @@ -1,28 +1,27 @@ -# -*- coding: utf-8 -*- - +# 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 include, url 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'^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'), + #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'^admin/', admin.site.urls), - url(r'^$', RedirectView.as_view(url= '/documents/', permanent=False)), + url(r'^$', RedirectView.as_view(url='/documents/', permanent=False)), url(r'^documents/', include('catalogue.urls')), url(r'^apiclient/', include('apiclient.urls')), url(r'^editor/', include('wiki.urls')), @@ -33,3 +32,6 @@ urlpatterns = [ 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))]