Fix theme editing.

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

diff --git a/src/redakcja/urls.py b/src/redakcja/urls.py
index 0e4dcea..8050ae1 100644 (file)
--- a/src/redakcja/urls.py
+++ b/src/redakcja/urls.py
@@ -1,7 +1,8 @@
 # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # 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.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 import admin
 from django.conf import settings
 from django.conf.urls.static import static


@@ -10,25 +11,38 @@ from django.views.generic import RedirectView
 import django_cas_ng.views
 
 
 import django_cas_ng.views
 
 

+

 urlpatterns = [
 urlpatterns = [

-    # Auth
-    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/', admin.site.urls),
     #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/', admin.site.urls),

-
+    path('catalogue/', include('catalogue.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'^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')),

+    url(r'^wlxml/', include('wlxml.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)