diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-06-30 16:50:58 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-06-30 16:50:58 +0200 |
| commit | 72b0a0276e70194666ff9110522f49f4e3f1476e (patch) | |
| tree | 6a41f63eabed5f6f3f7537585d5ae3f3a00e4d00 /archaeological_warehouse | |
| parent | 9fe30e305e1a114277e8473df415588bfacd188d (diff) | |
| parent | 483fcd46fb60a597959bfde9d00bde4cc1822cd2 (diff) | |
| download | Ishtar-72b0a0276e70194666ff9110522f49f4e3f1476e.tar.bz2 Ishtar-72b0a0276e70194666ff9110522f49f4e3f1476e.zip | |
Merge branch 'master' into v0.9
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 5d4427301..ec3aa1beb 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'), |