bugfix

[redakcja.git] / src / redakcja / urls.py

diff --git a/src/redakcja/urls.py b/src/redakcja/urls.py
index c0629fa..af8b4f2 100644 (file)
--- a/src/redakcja/urls.py
+++ b/src/redakcja/urls.py
@@ -1,36 +1,49 @@
-# -*- coding: utf-8 -*-
-
-from django.conf.urls import include, patterns, 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 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
 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_ng.views

 
 
 
 

-admin.autodiscover()

 
 

-urlpatterns = patterns('',
-    # 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'),
+urlpatterns = [
+    #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')),
 
     # Admin panel
     url(r'^admin/doc/', include('django.contrib.admindocs.urls')),

-    (r'^admin/', include(admin.site.urls)),
-
-    (r'^comments/', include('django.contrib.comments.urls')),
+    url(r'^admin/', admin.site.urls),

 
 

-    url(r'^$', RedirectView.as_view(url= '/documents/')),
-    url(r'^documents/', 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')),
     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)
 
 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))]