diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-09-13 00:18:29 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-09-13 00:18:29 +0200 |
| commit | 1cc2fe4062b16a91d04ed4ffa35248f82c92fbb4 (patch) | |
| tree | 3f239121db47139228c5b6d2cc4b95fb8d9533ef /archaeological_warehouse | |
| parent | 79ecf7ad94273476e4f0bc4c0351e6a6dbde090e (diff) | |
| download | Ishtar-1cc2fe4062b16a91d04ed4ffa35248f82c92fbb4.tar.bz2 Ishtar-1cc2fe4062b16a91d04ed4ffa35248f82c92fbb4.zip | |
New management of "popup" for new items -> change all form configuration
Diffstat (limited to 'archaeological_warehouse')
| -rw-r--r-- | archaeological_warehouse/forms.py | 2 | ||||
| -rw-r--r-- | archaeological_warehouse/views.py | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/archaeological_warehouse/forms.py b/archaeological_warehouse/forms.py index 5a558aa45..facc94467 100644 --- a/archaeological_warehouse/forms.py +++ b/archaeological_warehouse/forms.py @@ -143,6 +143,7 @@ class WarehouseForm(CustomForm, ManageOldType, forms.Form): form_label = _(u"Warehouse") form_admin_name = _(u"Warehouse - 010 - General") form_slug = "warehouse-010-general" + extra_form_modals = ["organization", "person"] associated_models = { 'warehouse_type': models.WarehouseType, 'person_in_charge': Person, @@ -259,6 +260,7 @@ class ContainerForm(CustomForm, ManageOldType, forms.Form): form_admin_name = _(u"Container - 010 - General") form_slug = "container-010-general" file_upload = True + extra_form_modals = ["warehouse", "organization", "person"] associated_models = {'container_type': models.ContainerType, 'location': models.Warehouse, 'responsible': models.Warehouse} diff --git a/archaeological_warehouse/views.py b/archaeological_warehouse/views.py index 67701f70b..b5ba1a784 100644 --- a/archaeological_warehouse/views.py +++ b/archaeological_warehouse/views.py @@ -35,7 +35,7 @@ from archaeological_warehouse.forms import WarehouseForm, ContainerForm, \ from ishtar_common.forms import FinalForm from ishtar_common.views import QABaseLockView -from ishtar_common.views_item import get_item, show_item, new_item +from ishtar_common.views_item import get_item, show_item, new_qa_item from archaeological_finds.views import treatment_add from archaeological_warehouse.wizards import PackagingWizard, WarehouseSearch, \ @@ -53,8 +53,8 @@ get_warehouse = get_item(models.Warehouse, 'get_warehouse', 'warehouse', search_form=WarehouseSelect) show_warehouse = show_item(models.Warehouse, 'warehouse') -new_warehouse = new_item(models.Warehouse, WarehouseForm) -new_container = new_item(models.Container, ContainerForm) +new_warehouse = new_qa_item(models.Warehouse, WarehouseForm) +new_container = new_qa_item(models.Container, ContainerForm) def autocomplete_warehouse(request): |