taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert urlpatterns to plain lists.

remotes/origin/enhancement/email-actions
Andrey Antukh 2014-09-24 10:38:58 +02:00
parent fc6a70fffc
commit 897058ca6c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
taiga/urls.py
View File

@ -21,11 +21,11 @@ from django.contrib import admin
from .routers import router from .routers import router
urlpatterns = patterns('', urlpatterns = [
url(r'^api/v1/', include(router.urls)), url(r'^api/v1/', include(router.urls)),
url(r'^api/v1/api-auth/', include('rest_framework.urls', namespace='rest_framework')), url(r'^api/v1/api-auth/', include('rest_framework.urls', namespace='rest_framework')),
url(r'^admin/', include(admin.site.urls)), url(r'^admin/', include(admin.site.urls)),
) ]
def mediafiles_urlpatterns(): def mediafiles_urlpatterns():
@ -38,13 +38,12 @@ def mediafiles_urlpatterns():
_media_url = _media_url[1:] _media_url = _media_url[1:]
from django.views.static import serve from django.views.static import serve
return patterns('', return [
(r'^%s(?P<path>.*)$' % 'media', serve, url(r'^%s(?P<path>.*)$' % 'media', serve,
{'document_root': settings.MEDIA_ROOT}) {'document_root': settings.MEDIA_ROOT})
) ]
urlpatterns += staticfiles_urlpatterns(prefix="/static/") urlpatterns += staticfiles_urlpatterns(prefix="/static/")
urlpatterns += mediafiles_urlpatterns() urlpatterns += mediafiles_urlpatterns()
handler500 = "taiga.base.api.views.api_server_error" handler500 = "taiga.base.api.views.api_server_error"