diff options
author | Filipp Lepalaan <filipp@mac.com> | 2016-02-03 13:15:40 +0200 |
---|---|---|
committer | Filipp Lepalaan <filipp@mac.com> | 2016-02-03 13:15:40 +0200 |
commit | 904537c9dd343f92e4f95eb1e5e047e5ac7e8ca8 (patch) | |
tree | 9742797de4279285a5ec72d8c7adbb05292cf088 /servo/urls/customer.py | |
parent | ead9662f6c3a0dfa77bf64c92c215f3e8367f902 (diff) | |
download | Servo-904537c9dd343f92e4f95eb1e5e047e5ac7e8ca8.tar.gz Servo-904537c9dd343f92e4f95eb1e5e047e5ac7e8ca8.tar.bz2 Servo-904537c9dd343f92e4f95eb1e5e047e5ac7e8ca8.zip |
Fix deprecation warnings in urlconfs
Diffstat (limited to 'servo/urls/customer.py')
-rw-r--r-- | servo/urls/customer.py | 56 |
1 files changed, 29 insertions, 27 deletions
diff --git a/servo/urls/customer.py b/servo/urls/customer.py index 9665aaf..fdb1f5b 100644 --- a/servo/urls/customer.py +++ b/servo/urls/customer.py @@ -1,37 +1,39 @@ # -*- coding: utf-8 -*- -from django.conf.urls import patterns, url +from django.conf.urls import url -urlpatterns = patterns( - "servo.views.customer", - url(r'^$', 'index', {'group': 'all'}, name="customers-list_all"), - url(r'^find/$', 'find', name="customers-find"), - url(r'^filter/$', 'filter', name="customers-filter"), - url(r'^download/$', 'download', name="customers-download"), - url(r'^download/(?P<group>[\w\-]+)/$', 'download', name="customers-download"), - url(r'^find/download$', 'download', name="customers-download_search"), - url(r'^groups/add/$', 'edit_group', name="customers-create_group"), - url(r'^groups/(?P<group>[\w\-]+)/edit/$', 'edit_group', +from servo.views.customer import * + + +urlpatterns = [ + url(r'^$', index, {'group': 'all'}, name="customers-list_all"), + url(r'^find/$', find, name="customers-find"), + url(r'^filter/$', filter, name="customers-filter"), + url(r'^download/$', download, name="customers-download"), + url(r'^download/(?P<group>[\w\-]+)/$', download, name="customers-download"), + url(r'^find/download$', download, name="customers-download_search"), + url(r'^groups/add/$', edit_group, name="customers-create_group"), + url(r'^groups/(?P<group>[\w\-]+)/edit/$', edit_group, name="customers-edit_group"), - url(r'^groups/(?P<group>[\w\-]+)/delete/$', 'delete_group', + url(r'^groups/(?P<group>[\w\-]+)/delete/$', delete_group, name="customers-delete_group"), - url(r'^(?P<group>[\w\-]+)/$', 'index', name="customers-list"), - url(r'^(?P<group>[\w\-]+)/upload/$', 'upload', name="customers-upload"), - url(r'^(?P<group>[\w\-]+)/add/$', 'edit', name="customers-create_customer"), - url(r'^(?P<group>[\w\-]+)/(?P<pk>\d+)/$', 'view', + url(r'^(?P<group>[\w\-]+)/$', index, name="customers-list"), + url(r'^(?P<group>[\w\-]+)/upload/$', upload, name="customers-upload"), + url(r'^(?P<group>[\w\-]+)/add/$', edit, name="customers-create_customer"), + url(r'^(?P<group>[\w\-]+)/(?P<pk>\d+)/$', view, name="customers-view_customer"), - url(r'^(?P<group>[\w\-]+)/(?P<pk>\d+)/edit/$', 'edit', + url(r'^(?P<group>[\w\-]+)/(?P<pk>\d+)/edit/$', edit, name="customers-edit_customer"), - url(r'^(?P<group>[\w\-]+)/(?P<pk>\d+)/delete/$', 'delete', + url(r'^(?P<group>[\w\-]+)/(?P<pk>\d+)/delete/$', delete, name="customers-delete_customer"), - url(r'^(?P<pk>\d+)/move/$', 'move', name="customers-move_customer"), - url(r'^(?P<pk>\d+)/move/(?P<new_parent>\d+)/$', 'move', + url(r'^(?P<pk>\d+)/move/$', move, name="customers-move_customer"), + url(r'^(?P<pk>\d+)/move/(?P<new_parent>\d+)/$', move, name="customers-move_customer"), - url(r'^(?P<pk>\d+)/merge/$', 'merge', name="customers-merge_customer"), - url(r'^(?P<pk>\d+)/merge/(?P<target>\d+)/$', 'merge', + url(r'^(?P<pk>\d+)/merge/$', merge, name="customers-merge_customer"), + url(r'^(?P<pk>\d+)/merge/(?P<target>\d+)/$', merge, name="customers-merge_customer"), - url(r'^(?P<parent_id>\d+)/new/$', 'edit', name="customers-create_contact"), - url(r'^(\d+)/orders/(\d+)/$', 'add_order', name="customers-add_to_order"), - url(r'^(?P<pk>\d+)/notes/$', 'notes', name="customers-list_notes"), - url(r'^(?P<pk>\d+)/notes/new/$', 'create_message', name="customers-create_message"), -) + url(r'^(?P<parent_id>\d+)/new/$', edit, name="customers-create_contact"), + url(r'^(\d+)/orders/(\d+)/$', add_order, name="customers-add_to_order"), + url(r'^(?P<pk>\d+)/notes/$', notes, name="customers-list_notes"), + url(r'^(?P<pk>\d+)/notes/new/$', create_message, name="customers-create_message"), +] |