entrouvert
/
fargo
17
0
Fork 0
Code Issues Pull Requests 1 Releases Activity

misc: remove usage of django.conf.urls.patterns (#16055)

This commit is contained in:
Frédéric Péters 2017-04-26 18:29:08 +02:00
parent fd1fefe082
commit 944669be12
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fargo/urls.py
View File

@ -1,13 +1,12 @@
from django.conf import settings
from django.conf.urls import patterns, include, url
from django.conf.urls import include, url
from django.contrib import admin
from .fargo.views import (home, jsonp, json, document, download, pick, delete, upload,
remote_download, login, logout, pick_list, document_types, thumbnail)
from .fargo.api_views import (push_document, recent_documents, router)
urlpatterns = patterns(
'',
urlpatterns = [
url(r'^$', home, name='home'),
url(r'^pick/$', pick_list, name='list_to_pick'),
url(r'^jsonp/$', jsonp, name='jsonp'),
@ -30,9 +29,8 @@ urlpatterns = patterns(
url(r'^api/documents/push/$', push_document, name='fargo-api-push-document'),
url(r'^api/documents/recently-added/$', recent_documents),
url(r'^api/', include(router.urls)),
)
]
if 'mellon' in settings.INSTALLED_APPS:
urlpatterns += patterns('',
url(r'^accounts/mellon/', include('mellon.urls')))
urlpatterns.append(url(r'^accounts/mellon/', include('mellon.urls')))