diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-06-11 11:59:00 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2021-02-28 12:15:20 +0100 |
commit | 855d7df00ff702b8191bbe6bb44a21124799228e (patch) | |
tree | 1e11e1946254e74e7c30140368c1736e3668c282 /archaeological_warehouse | |
parent | 19239382e83f7c9a6d6991ea0b9198f291cdc277 (diff) | |
download | Ishtar-855d7df00ff702b8191bbe6bb44a21124799228e.tar.bz2 Ishtar-855d7df00ff702b8191bbe6bb44a21124799228e.zip |
New container: parent container search dependency (refs #4936) - remove + button for parent (refs #4937)
Diffstat (limited to 'archaeological_warehouse')
-rw-r--r-- | archaeological_warehouse/forms.py | 5 | ||||
-rw-r--r-- | archaeological_warehouse/urls.py | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/archaeological_warehouse/forms.py b/archaeological_warehouse/forms.py index cadfaaee1..125adb2b5 100644 --- a/archaeological_warehouse/forms.py +++ b/archaeological_warehouse/forms.py @@ -278,9 +278,8 @@ class ContainerForm(CustomForm, ManageOldType, forms.Form): label=_("Parent container"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-container'), - associated_model=models.Container, new=True, - tips="-" - ), + associated_model=models.Container, + dynamic_limit=['location']), validators=[valid_id(models.Container)], required=False ) diff --git a/archaeological_warehouse/urls.py b/archaeological_warehouse/urls.py index 0285d292f..14c957a26 100644 --- a/archaeological_warehouse/urls.py +++ b/archaeological_warehouse/urls.py @@ -51,7 +51,7 @@ urlpatterns = [ url(r'get-warehouse-shortcut/(?P<type>.+)?$', views.get_warehouse, name='get-warehouse-shortcut', kwargs={'full': 'shortcut'}), - url(r'autocomplete-container/(?P<warehouse_id>\d+)?$', + url(r'autocomplete-container/(?P<warehouse_id>\d+)?(?:/)?$', views.autocomplete_container, name='autocomplete-container'), url(r'^show-container(?:/(?P<pk>.+))?/(?P<type>.+)?$', views.show_container, name=models.Container.SHOW_URL), |