From ee6a1eb3588da3c6c1c3f0e75691541cea2d37ab Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 22 Dec 2014 12:55:56 +0100 Subject: Workon alternate administrativ wizard * reorganization of address fields * add a main town field * reorganize parcel wizard * workon new administrativ wizard --- archaeological_files_pdl/views.py | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'archaeological_files_pdl/views.py') diff --git a/archaeological_files_pdl/views.py b/archaeological_files_pdl/views.py index 7d51c8ec5..1dd69b50c 100644 --- a/archaeological_files_pdl/views.py +++ b/archaeological_files_pdl/views.py @@ -19,10 +19,9 @@ from django.utils.translation import ugettext_lazy as _ -from archaeological_files.wizards import FileWizard +from archaeological_files_pdl.wizards import FileWizard from archaeological_operations.wizards import is_preventive, is_not_preventive -from ishtar_common.forms_common import TownFormset from archaeological_files_pdl import forms from archaeological_files import forms as ref_forms from archaeological_operations.forms import ParcelFormSet @@ -30,16 +29,20 @@ from archaeological_operations.forms import ParcelFormSet from archaeological_files import models file_creation_wizard = FileWizard.as_view([ - ('general-file_creation', forms.FileFormGeneral), - ('towns-file_creation', TownFormset), - ('parcels-file_creation', ParcelFormSet), - ('preventive-file_creation', ref_forms.FileFormPreventive), - ('research-file_creation', ref_forms.FileFormResearch), - ('final-file_creation', ref_forms.FinalForm)], + ('general-file_creation', forms.FileFormGeneral), + ('preventivetype-file_creation', forms.FileFormPreventiveType), + ('preventiveplanning-file_creation', forms.FileFormPlanning), + ('parcelspdl-file_creation', ParcelFormSet), + ('preventive-file_creation', ref_forms.FileFormPreventive), + ('research-file_creation', ref_forms.FileFormResearch), + ('final-file_creation', ref_forms.FinalForm)], label=_(u"New file"), condition_dict={ + 'preventivetype-file_creation':\ + is_preventive('general-file_creation', models.FileType, + type_key='file_type'), 'preventive-file_creation':\ - is_preventive( 'general-file_creation', models.FileType, + is_preventive('general-file_creation', models.FileType, type_key='file_type'), 'research-file_creation':\ is_not_preventive('general-file_creation', models.FileType, -- cgit v1.2.3