diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-07-17 15:45:57 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2013-07-17 15:45:57 +0200 |
| commit | 8bb0a8a8bf383e752486a6b08f43edd421750278 (patch) | |
| tree | e7c6641975b890f2f2f1d44a96d13a9ce02fb4cc /archaeological_files/forms.py | |
| parent | 2fa1a102e1fa674618b98abdad715dab4b5db779 (diff) | |
| download | Ishtar-8bb0a8a8bf383e752486a6b08f43edd421750278.tar.bz2 Ishtar-8bb0a8a8bf383e752486a6b08f43edd421750278.zip | |
Fix cache issues
Diffstat (limited to 'archaeological_files/forms.py')
| -rw-r--r-- | archaeological_files/forms.py | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index ad5b3f614..27617f8ad 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -47,8 +47,7 @@ class FileSelect(TableSelect): towns = get_town_field() in_charge = get_person_field(label=_(u"Person in charge"), person_type='sra_agent') - file_type = forms.ChoiceField(label=_("File type"), - choices=models.FileType.get_types()) + file_type = forms.ChoiceField(label=_("File type"), choices=[]) saisine_type = forms.ChoiceField(label=_("Saisine type"), choices=[]) year = forms.IntegerField(label=_("Year")) parcel = ParcelField(label=_("Parcel (section/number)")) @@ -57,6 +56,8 @@ class FileSelect(TableSelect): super(FileSelect, self).__init__(*args, **kwargs) self.fields['saisine_type'].choices = models.SaisineType.get_types() self.fields['saisine_type'].help_text = models.SaisineType.get_help() + self.fields['file_type'].choices = models.FileType.get_types() + self.fields['file_type'].help_text = models.FileType.get_help() def get_input_ids(self): ids = super(FileSelect, self).get_input_ids() @@ -102,8 +103,7 @@ class FileFormGeneral(forms.Form): name = forms.CharField(label=_(u"Name"), required=False) creation_date = forms.DateField(label=_(u"Creation date"), initial=get_now, widget=widgets.JQueryDate) - file_type = forms.ChoiceField(label=_("File type"), - choices=models.FileType.get_types()) + file_type = forms.ChoiceField(label=_("File type"), choices=[]) related_file = forms.IntegerField(label=_("Related file"), required=False, widget=widgets.JQueryAutoComplete(reverse_lazy('autocomplete-file'), associated_model=models.File), @@ -111,6 +111,11 @@ class FileFormGeneral(forms.Form): comment = forms.CharField(label=_(u"Comment"), widget=forms.Textarea, required=False) + def __init__(self, *args, **kwargs): + super(FileFormGeneral, self).__init__(*args, **kwargs) + self.fields['file_type'].choices = models.FileType.get_types() + self.fields['file_type'].help_text = models.FileType.get_help() + class FileFormGeneralRO(FileFormGeneral): year = forms.IntegerField(label=_(u"Year"), widget=forms.TextInput(attrs={'readonly':True})) @@ -153,7 +158,7 @@ class FileFormPreventive(forms.Form): associated_model=Organization, new=True), validators=[valid_id(Organization)]) permit_type = forms.ChoiceField(label=_(u"Permit type"), required=False, - choices=models.PermitType.get_types()) + choices=[]) permit_reference = forms.CharField(label=_(u"Permit reference"), required=False, validators=[validators.MaxLengthValidator(60)]) total_developed_surface = forms.IntegerField(widget=widgets.AreaWidget, @@ -169,6 +174,8 @@ class FileFormPreventive(forms.Form): super(FileFormPreventive, self).__init__(*args, **kwargs) self.fields['saisine_type'].choices = models.SaisineType.get_types() self.fields['saisine_type'].help_text = models.SaisineType.get_help() + self.fields['permit_type'].choices = models.PermitType.get_types() + self.fields['permit_type'].help_text = models.PermitType.get_help() class FinalFileClosingForm(FinalForm): |