diff options
Diffstat (limited to 'archaeological_files_pdl')
| -rw-r--r-- | archaeological_files_pdl/forms.py | 4 | ||||
| -rw-r--r-- | archaeological_files_pdl/views.py | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py index 0adfa087a..84931996a 100644 --- a/archaeological_files_pdl/forms.py +++ b/archaeological_files_pdl/forms.py @@ -309,8 +309,12 @@ class FileFormInstruction(forms.Form): c_year = datetime.date.today().year if 'year' in kwargs: c_year = kwargs.pop('year') + if 'data' in kwargs: + kwargs['data'][kwargs.get('prefix', '') + '-year'] = c_year + super(FileFormInstruction, self).__init__(*args, **kwargs) self.fields['year'].initial = c_year + self.fields['year'].widget.attrs.update({'readonly': 'readonly'}) c_num, lasts = 0, "" q = models.File.objects.filter(numeric_reference__isnull=False, diff --git a/archaeological_files_pdl/views.py b/archaeological_files_pdl/views.py index 8305bdab7..b3acc12b1 100644 --- a/archaeological_files_pdl/views.py +++ b/archaeological_files_pdl/views.py @@ -55,8 +55,7 @@ file_creation_wizard = FileWizard.as_view([ 'planningservice-file_creation': file_creation_wizard_is_preventive, 'researchaddress-file_creation': file_creation_wizard_is_not_preventive, - 'research-file_creation': file_creation_wizard_is_not_preventive - }, + 'research-file_creation': file_creation_wizard_is_not_preventive}, url_name='file_creation',) file_modification_wizard_is_preventive = is_preventive( @@ -86,8 +85,7 @@ file_modification_wizard = FileModificationWizard.as_view([ file_modification_wizard_is_preventive, 'researchaddress-file_modification': file_modification_wizard_is_not_preventive, - 'research-file_modification': file_modification_wizard_is_not_preventive - }, + 'research-file_modification': file_modification_wizard_is_not_preventive}, url_name='file_modification',) |