summaryrefslogtreecommitdiff
path: root/archaeological_warehouse/urls.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-06-30 17:26:44 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-06-30 17:26:44 +0200
commitffd57727a66952e12b5236e7567f5fd75eb7e5f8 (patch)
tree2b8ab152e92a95948e9a038ebcef815bfd56aa38 /archaeological_warehouse/urls.py
parent2a0842c8ffb0e7eec6b350f9d170670c8376cce8 (diff)
parent18995ac80a961083ad986f4abe984fd649ec40e2 (diff)
downloadIshtar-ffd57727a66952e12b5236e7567f5fd75eb7e5f8.tar.bz2
Ishtar-ffd57727a66952e12b5236e7567f5fd75eb7e5f8.zip
Merge branch 'master' into develop
Diffstat (limited to 'archaeological_warehouse/urls.py')
-rw-r--r--archaeological_warehouse/urls.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/archaeological_warehouse/urls.py b/archaeological_warehouse/urls.py
index 40dedc801..2ef3c8e58 100644
--- a/archaeological_warehouse/urls.py
+++ b/archaeological_warehouse/urls.py
@@ -42,7 +42,7 @@ urlpatterns += patterns(
name='autocomplete-warehouse'),
url(r'new-container/(?P<parent_name>.+)?/$',
'new_container', name='new-container'),
- url(r'get-container/$', 'get_container',
+ url(r'get-container/(?P<type>.+)?$', 'get_container',
name='get-container'),
url(r'get-warehouse/(?P<type>.+)?$', 'get_warehouse',
name='get-warehouse'),