summaryrefslogtreecommitdiff
path: root/archaeological_warehouse/urls.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-03-21 23:59:27 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-03-21 23:59:27 +0100
commitb8cf790377a2ece768ea19bd1d216fdf0ee78cda (patch)
treeb72020ae9a2cee74a3060fc17495f445aa414e0e /archaeological_warehouse/urls.py
parent456b74ac295815970483871cf2575863bc97dd6f (diff)
parent88fde9b54bd94e582fa4f8886463eda2e39ceb46 (diff)
downloadIshtar-b8cf790377a2ece768ea19bd1d216fdf0ee78cda.tar.bz2
Ishtar-b8cf790377a2ece768ea19bd1d216fdf0ee78cda.zip
Merge branch 'v0.9' into wheezy
Diffstat (limited to 'archaeological_warehouse/urls.py')
-rw-r--r--archaeological_warehouse/urls.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/archaeological_warehouse/urls.py b/archaeological_warehouse/urls.py
index 133d4ae79..5d4427301 100644
--- a/archaeological_warehouse/urls.py
+++ b/archaeological_warehouse/urls.py
@@ -23,7 +23,7 @@ from ishtar_common.wizards import check_rights
import views
from archaeological_warehouse import models
-# be carreful: each check_rights must be relevant with ishtar_menu
+# be careful: each check_rights must be relevant with ishtar_menu
# forms
urlpatterns = patterns(
@@ -64,6 +64,9 @@ urlpatterns += patterns(
check_rights(['change_warehouse'])(
views.warehouse_deletion_wizard),
name='warehouse_deletion'),
+ url(r'warehouse-modify/(?P<pk>.+)/$',
+ views.warehouse_modify, name='warehouse_modify'),
+
url(r'^container_search/(?P<step>.+)?$',
check_rights(['change_warehouse'])(
views.container_search_wizard),
@@ -80,4 +83,6 @@ urlpatterns += patterns(
check_rights(['change_warehouse'])(
views.container_deletion_wizard),
name='container_deletion'),
-)
+ url(r'container-modify/(?P<pk>.+)/$',
+ views.container_modify, name='container_modify'),
+) \ No newline at end of file