summaryrefslogtreecommitdiff
path: root/archaeological_warehouse/urls.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-08-21 18:21:53 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-08-21 18:21:53 +0200
commit27c460410144dc94f9a279c8d1bc3e66fc715229 (patch)
treec116345a9984d2b81f39b1ce9a25b4060afaaa27 /archaeological_warehouse/urls.py
parent96b44d0513843ee9065ba102376579ed4e9969a6 (diff)
downloadIshtar-27c460410144dc94f9a279c8d1bc3e66fc715229.tar.bz2
Ishtar-27c460410144dc94f9a279c8d1bc3e66fc715229.zip
urls: remove pattern (not compatible with Django 1.11)
Diffstat (limited to 'archaeological_warehouse/urls.py')
-rw-r--r--archaeological_warehouse/urls.py29
1 files changed, 13 insertions, 16 deletions
diff --git a/archaeological_warehouse/urls.py b/archaeological_warehouse/urls.py
index 2ef3c8e58..5be9183d2 100644
--- a/archaeological_warehouse/urls.py
+++ b/archaeological_warehouse/urls.py
@@ -17,38 +17,35 @@
# See the file COPYING for details.
-from django.conf.urls import patterns, url
+from django.conf.urls import url
from ishtar_common.wizards import check_rights
-import views
+from archaeological_warehouse import views
+
from archaeological_warehouse import models
# be careful: each check_rights must be relevant with ishtar_menu
# forms
-urlpatterns = patterns(
- '',
+urlpatterns = [
url(r'warehouse_packaging/(?P<step>.+)?$',
views.warehouse_packaging_wizard, name='warehouse_packaging'),
-)
-urlpatterns += patterns(
- 'archaeological_warehouse.views',
url(r'new-warehouse/(?P<parent_name>.+)?/$',
- 'new_warehouse', name='new-warehouse'),
- url(r'^show-warehouse(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_warehouse',
+ views.new_warehouse, name='new-warehouse'),
+ url(r'^show-warehouse(?:/(?P<pk>.+))?/(?P<type>.+)?$', views.show_warehouse,
name=models.Warehouse.SHOW_URL),
- url(r'autocomplete-warehouse/$', 'autocomplete_warehouse',
+ url(r'autocomplete-warehouse/$', views.autocomplete_warehouse,
name='autocomplete-warehouse'),
url(r'new-container/(?P<parent_name>.+)?/$',
- 'new_container', name='new-container'),
- url(r'get-container/(?P<type>.+)?$', 'get_container',
+ views.new_container, name='new-container'),
+ url(r'get-container/(?P<type>.+)?$', views.get_container,
name='get-container'),
- url(r'get-warehouse/(?P<type>.+)?$', 'get_warehouse',
+ url(r'get-warehouse/(?P<type>.+)?$', views.get_warehouse,
name='get-warehouse'),
url(r'autocomplete-container/?$',
- 'autocomplete_container', name='autocomplete-container'),
- url(r'^show-container(?:/(?P<pk>.+))?/(?P<type>.+)?$', 'show_container',
+ views.autocomplete_container, name='autocomplete-container'),
+ url(r'^show-container(?:/(?P<pk>.+))?/(?P<type>.+)?$', views.show_container,
name=models.Container.SHOW_URL),
url(r'^warehouse_search/(?P<step>.+)?$',
check_rights(['view_warehouse', 'view_own_warehouse'])(
@@ -85,4 +82,4 @@ urlpatterns += patterns(
name='container_deletion'),
url(r'container-modify/(?P<pk>.+)/$',
views.container_modify, name='container_modify'),
-) \ No newline at end of file
+] \ No newline at end of file