ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2252 from ThomasJunk/mediafix

Browse Source 
Added static media handling (Fixes 2223)
This commit is contained in:
Norman Jäckel 2016-08-09 16:03:22 +02:00 committed by GitHub
commit 9813edf490
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openslides/urls.py
View File

@ -1,5 +1,7 @@
from django.conf import settings
from django.conf.urls import include, url from django.conf.urls import include, url
from django.views.generic import RedirectView from django.views.generic import RedirectView
from django.views.static import serve
from openslides.utils.plugins import get_all_plugin_urlpatterns from openslides.utils.plugins import get_all_plugin_urlpatterns
from openslides.utils.rest_api import router from openslides.utils.rest_api import router
@ -7,6 +9,7 @@ from openslides.utils.rest_api import router
urlpatterns = get_all_plugin_urlpatterns() urlpatterns = get_all_plugin_urlpatterns()
urlpatterns += [ urlpatterns += [
url(r'^%s(?P<path>.*)$' % settings.MEDIA_URL.lstrip('/'), serve, {'document_root': settings.MEDIA_ROOT}),
url(r'^(?P<url>.*[^/])$', RedirectView.as_view(url='/%(url)s/', permanent=True)), url(r'^(?P<url>.*[^/])$', RedirectView.as_view(url='/%(url)s/', permanent=True)),
url(r'^rest/', include(router.urls)), url(r'^rest/', include(router.urls)),
url(r'^agenda/', include('openslides.agenda.urls')), url(r'^agenda/', include('openslides.agenda.urls')),