summaryrefslogtreecommitdiff
path: root/chimere_example_project
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-03-12 13:12:43 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-03-12 13:12:43 +0100
commitf57f079c23c739550095e6f54b762f13339123e0 (patch)
treee74d6f8f503d2157b82ad160db184752ba81fa1a /chimere_example_project
parent4c3071db2a009e41af87bfada2fcb27ffc70d474 (diff)
downloadChimère-f57f079c23c739550095e6f54b762f13339123e0.tar.bz2
Chimère-f57f079c23c739550095e6f54b762f13339123e0.zip
Merge Saclay inside chimere main
Diffstat (limited to 'chimere_example_project')
-rw-r--r--chimere_example_project/urls.py23
1 files changed, 2 insertions, 21 deletions
diff --git a/chimere_example_project/urls.py b/chimere_example_project/urls.py
index 367fa59..5271876 100644
--- a/chimere_example_project/urls.py
+++ b/chimere_example_project/urls.py
@@ -17,32 +17,13 @@
# See the file COPYING for details.
-from django.conf import settings
from django.conf.urls import url, include
from django.contrib import admin
-from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-
-from django.views.static import serve
admin.autodiscover()
-urlpatterns = []
-if settings.DEBUG:
- urlpatterns += [
- url(r'^media/(?P<path>.*)$', serve, {
- 'document_root': settings.MEDIA_ROOT,
- }),
- ]
-
-if "tinymce" in settings.INSTALLED_APPS:
- urlpatterns += [
- url(r'^tinymce/', include('tinymce.urls')),
- ]
-
-urlpatterns += staticfiles_urlpatterns()
-urlpatterns += [
- url(r'^admin/', include(admin.site.urls)),
- url(r'^', include('chimere.urls', namespace="chimere")),
+urlpatterns = [
+ url(r'^', include('chimere.urls')),
]