diff options
Diffstat (limited to 'archaeological_files/forms.py')
| -rw-r--r-- | archaeological_files/forms.py | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index f78347b6c..f6c6bf48b 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -40,13 +40,15 @@ from ishtar_common.forms import FinalForm, get_now, reverse_lazy, TableSelect, \ ManageOldType, CustomForm, FieldType, IshtarForm from ishtar_common.forms_common import get_town_field from archaeological_operations.forms import AdministrativeActForm, \ - AdministrativeActOpeFormSelection, \ - ParcelField, SLICING, AdministrativeActModifForm, ParcelForm, ParcelFormSet + AdministrativeActOpeFormSelection, SLICING, AdministrativeActModifForm, \ + ParcelForm, ParcelFormSet from ishtar_common import widgets from bootstrap_datepicker.widgets import DatePicker -class FileSelect(TableSelect): +class FileSelect(TableSelect): # OK + _model = models.File + search_vector = forms.CharField( label=_(u"Full text search"), widget=widgets.SearchWidget( 'archaeological-files', 'file' @@ -56,7 +58,7 @@ class FileSelect(TableSelect): internal_reference = forms.CharField(max_length=200, label=_("Other reference")) towns = get_town_field() - parcel = ParcelField(label=_("Parcel (section/number/public domain)")) + parcel = forms.CharField(label=_(u"Parcel")) if settings.ISHTAR_DPTS: towns__numero_insee__startswith = forms.ChoiceField( label=_(u"Department"), choices=[]) @@ -105,28 +107,19 @@ class FileSelect(TableSelect): associated_model=Person), validators=[valid_id(Person)]) + TYPES = [ + FieldType('saisine_type', models.SaisineType), + FieldType('permit_type', models.PermitType), + FieldType('file_type', models.FileType), + ] + 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() - self.fields['permit_type'].choices = models.PermitType.get_types() - self.fields['permit_type'].help_text = models.PermitType.get_help() - self.fields['file_type'].choices = models.FileType.get_types() - self.fields['file_type'].help_text = models.FileType.get_help() if settings.ISHTAR_DPTS: k = 'towns__numero_insee__startswith' self.fields[k].choices = [ ('', '--')] + list(settings.ISHTAR_DPTS) - def get_input_ids(self): - ids = super(FileSelect, self).get_input_ids() - ids.pop(ids.index('parcel')) - ids.append('parcel_0') - ids.append('parcel_1') - ids.append('parcel_2') - return ids - class FileFormSelection(forms.Form): SEARCH_AND_SELECT = True |