diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-08-02 15:39:18 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-12-12 12:23:17 +0100 |
| commit | dee51462642460801b57b6c896695f48d07c6acb (patch) | |
| tree | 398c2f5cc794139f363aa81117febbfbb0ab7c87 /archaeological_files_pdl | |
| parent | 1562c200ca28da7b5931b9c992e803c830510499 (diff) | |
| download | Ishtar-dee51462642460801b57b6c896695f48d07c6acb.tar.bz2 Ishtar-dee51462642460801b57b6c896695f48d07c6acb.zip | |
Files: fix parcel form - general contractor check - remove parcel formset in wizard
Diffstat (limited to 'archaeological_files_pdl')
| -rw-r--r-- | archaeological_files_pdl/forms.py | 10 | ||||
| -rw-r--r-- | archaeological_files_pdl/views.py | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py index 18940f2d5..58480a36b 100644 --- a/archaeological_files_pdl/forms.py +++ b/archaeological_files_pdl/forms.py @@ -330,11 +330,11 @@ class FileFormGeneralContractor(CustomForm, ManageOldType): ) def clean(self): - general_contractor = self.cleaned_data["general_contractor"] - corporation_general_contractor = self.cleaned_data[ - "corporation_general_contractor" - ] - if general_contractor: + general_contractor = self.cleaned_data.get("general_contractor", None) + corporation_general_contractor = self.cleaned_data.get( + "corporation_general_contractor", None + ) + if general_contractor and corporation_general_contractor: try: person = models.Person.objects.get(pk=general_contractor) except models.Person.DoesNotExist: diff --git a/archaeological_files_pdl/views.py b/archaeological_files_pdl/views.py index a0c5720d1..717f945cf 100644 --- a/archaeological_files_pdl/views.py +++ b/archaeological_files_pdl/views.py @@ -42,7 +42,6 @@ file_creation_wizard = FileWizard.as_view( ("preventivetype-file_creation", forms.FileFormPreventiveType), ("preventiveplanning-file_creation", forms.FileFormPlanning), ("researchaddress-file_creation", forms.FileFormResearchAddress), - ("parcelspdl-file_creation", ref_forms.ParcelFormset), ("generalcontractor-file_creation", forms.FileFormGeneralContractor), ("planningservice-file_creation", forms.FileFormPlanningService), ("research-file_creation", ref_forms.FileFormResearch), @@ -74,7 +73,6 @@ file_modification_wizard = FileModificationWizard.as_view( ("preventivetype-file_modification", forms.FileFormPreventiveType), ("preventiveplanning-file_modification", forms.FileFormPlanning), ("researchaddress-file_modification", forms.FileFormResearchAddress), - ("parcelspdl-file_modification", ref_forms.ParcelFormset), ("generalcontractor-file_modification", forms.FileFormGeneralContractor), ("planningservice-file_modification", forms.FileFormPlanningService), ("research-file_modification", ref_forms.FileFormResearch), |