diff options
Diffstat (limited to 'ishtar/furnitures/forms_files.py')
| -rw-r--r-- | ishtar/furnitures/forms_files.py | 48 |
1 files changed, 31 insertions, 17 deletions
diff --git a/ishtar/furnitures/forms_files.py b/ishtar/furnitures/forms_files.py index 632f1d9f3..da77eff85 100644 --- a/ishtar/furnitures/forms_files.py +++ b/ishtar/furnitures/forms_files.py @@ -36,7 +36,7 @@ import models import widgets from forms import Wizard, FinalForm, FormSet, ClosingWizard, SearchWizard, \ formset_factory, get_now, reverse_lazy -from forms_common import TownFormSet, ParcelFormSet +from forms_common import TownFormSet, ParcelFormSet, get_town_field from forms_operations import OperationAdministrativeActWizard, \ AdministrativeActOpeForm, AdministrativeActOpeFormSelection, \ AdministrativeActDeletionWizard, FinalAdministrativeActDeleteForm, is_preventive @@ -125,16 +125,17 @@ class FileWizard(Wizard): return res class FileSelect(forms.Form): - towns = forms.IntegerField(label=_(u"Town"), - widget=widgets.JQueryAutoComplete("/" + settings.URL_PATH + \ - 'autocomplete-town', associated_model=models.Town), - validators=[models.valid_id(models.Town)]) + towns = get_town_field() file_type = forms.ChoiceField(label=_("File type"), choices=models.FileType.get_types()) - saisine_type = forms.ChoiceField(label=_("Saisine type"), - choices=models.SaisineType.get_types()) + saisine_type = forms.ChoiceField(label=_("Saisine type"), choices=[]) year = forms.IntegerField(label=_("Year")) + def __init__(self, *args, **kwargs): + 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() + class FileFormSelection(forms.Form): form_label = _("Archaeological file search") associated_models = {'pk':models.File} @@ -229,10 +230,14 @@ class FileFormPreventive(forms.Form): required=False, validators=[validators.MinValueValidator(0), validators.MaxValueValidator(999999999)]) if settings.COUNTRY == 'fr': - saisine_type = forms.ChoiceField(label=_("Saisine type"), - choices=models.SaisineType.get_types()) + saisine_type = forms.ChoiceField(label=_(u"Saisine type"), + choices=[]) reception_date = forms.DateField(label=_(u"Reception date"), initial=get_now, widget=widgets.JQueryDate) + def __init__(self, *args, **kwargs): + 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() file_search_wizard = SearchWizard([('general-file_search', FileFormSelection)], url_name='file_search',) @@ -320,12 +325,15 @@ class FileEditAdministrativeActWizard(FileAdministrativeActWizard): return self.get_current_object(request, storage).associated_file class AdministrativeActFileSelect(forms.Form): - associated_file__towns = forms.IntegerField(label=_(u"Town"), - widget=widgets.JQueryAutoComplete("/" + settings.URL_PATH + \ - 'autocomplete-town', associated_model=models.Town), - validators=[models.valid_id(models.Town)]) - act_type = forms.ChoiceField(label=_("Act type"), - choices=models.ActType.get_types(dct={'intented_to':'F'})) + associated_file__towns = get_town_field() + act_type = forms.ChoiceField(label=_("Act type"), choices=[]) + + def __init__(self, *args, **kwargs): + super(AdministrativeActFileSelect, self).__init__(*args, **kwargs) + self.fields['act_type'].choices = models.ActType.get_types( + dct={'intented_to':'F'}) + self.fields['act_type'].help_text = models.ActType.get_help( + dct={'intented_to':'F'}) class AdministrativeActFileFormSelection(AdministrativeActOpeFormSelection): pk = forms.IntegerField(label="", required=False, @@ -335,8 +343,14 @@ class AdministrativeActFileFormSelection(AdministrativeActOpeFormSelection): validators=[models.valid_id(models.AdministrativeAct)]) class AdministrativeActFileForm(AdministrativeActOpeForm): - act_type = forms.ChoiceField(label=_("Act type"), - choices=models.ActType.get_types(dct={'intented_to':'F'})) + act_type = forms.ChoiceField(label=_(u"Act type"), choices=[]) + + def __init__(self, *args, **kwargs): + super(AdministrativeActFileForm, self).__init__(*args, **kwargs) + self.fields['act_type'].choices = models.ActType.get_types( + dct={'intented_to':'F'}) + self.fields['act_type'].help_text = models.ActType.get_help( + dct={'intented_to':'F'}) file_administrativeactfile_wizard = FileAdministrativeActWizard([ ('selec-file_administrativeactfile', FileFormSelection), |