diff options
| 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 |
| commit | 726713f95f91fa83a8e1473625162ae831309952 (patch) | |
| tree | 2b8ab152e92a95948e9a038ebcef815bfd56aa38 /archaeological_warehouse | |
| parent | fd21739351daf697188329948492c65b1a9bd7e6 (diff) | |
| parent | 483fcd46fb60a597959bfde9d00bde4cc1822cd2 (diff) | |
| download | Ishtar-726713f95f91fa83a8e1473625162ae831309952.tar.bz2 Ishtar-726713f95f91fa83a8e1473625162ae831309952.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'archaeological_warehouse')
| -rw-r--r-- | archaeological_warehouse/urls.py | 2 |
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'), |