diff options
author | Christian Pointner <equinox@helsinki.at> | 2016-05-27 20:03:04 (GMT) |
---|---|---|
committer | Christian Pointner <equinox@helsinki.at> | 2016-05-27 20:03:04 (GMT) |
commit | 4a66728a9bbe88704c6e01ec8dd683cdb0a4c0c6 (patch) | |
tree | 9c62c09230aec03187cc13d2ac78d299bd96096b /pv/urls.py | |
parent | a1487772e667436e2274dece86cb40d2e58632a7 (diff) | |
parent | c27b374386463c56f41815869d6209f9a422b858 (diff) |
Merge branch 'master' into stable
Diffstat (limited to 'pv/urls.py')
-rw-r--r-- | pv/urls.py | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -2,19 +2,20 @@ from django.conf import settings from django.conf.urls import patterns, url, include from django.contrib import admin -admin.autodiscover() - from program.views import json_day_schedule +admin.autodiscover() + urlpatterns = patterns('', url(r'^admin/', include(admin.site.urls)), url(r'^program/', include('program.urls')), url(r'^nop', include('nop.urls')), url(r'^tinymce/', include('tinymce.urls')), url(r'^export/day_schedule/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/$', json_day_schedule) -) + ) if settings.DEBUG: urlpatterns += patterns('', - (r'^site_media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}) -) + (r'^site_media/(?P<path>.*)$', 'django.views.static.serve', + {'document_root': settings.MEDIA_ROOT}) + ) |