diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-08-10 12:59:00 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-08-13 18:26:04 +0200 |
| commit | 23b95b9d8de9037e40b0c79e9d0fdda1dba23d2b (patch) | |
| tree | b3a79525887488ca98e4adccbcab9538c0e6f9a5 /archaeological_files | |
| parent | d643afb7db26be3a697bfd0ab1ab2239ef7b1275 (diff) | |
| download | Ishtar-23b95b9d8de9037e40b0c79e9d0fdda1dba23d2b.tar.bz2 Ishtar-23b95b9d8de9037e40b0c79e9d0fdda1dba23d2b.zip | |
Search administrativ act configuration
Diffstat (limited to 'archaeological_files')
| -rw-r--r-- | archaeological_files/forms.py | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index 645953a78..f78347b6c 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -408,7 +408,9 @@ class FinalFileDeleteForm(FinalForm): confirm_end_msg = _(u"Would you like to delete this archaeological file ?") -class AdministrativeActFileModifySelect(TableSelect): +class AdministrativeActFileModifySelect(TableSelect): # OK + _model = AdministrativeAct + search_vector = forms.CharField( label=_(u"Full text search"), widget=widgets.SearchWidget( 'archaeological-operations', 'administrativeact' @@ -439,7 +441,9 @@ class AdministrativeActFileModifySelect(TableSelect): ('', '--')] + list(settings.ISHTAR_DPTS) -class AdministrativeActFileSelect(TableSelect): +class AdministrativeActFileSelect(TableSelect): # OK + _model = AdministrativeAct + search_vector = forms.CharField( label=_(u"Full text search"), widget=widgets.SearchWidget( 'archaeological-operations', 'administrativeact' @@ -452,17 +456,17 @@ class AdministrativeActFileSelect(TableSelect): act_type = forms.ChoiceField(label=_("Act type"), choices=[]) indexed = forms.NullBooleanField(label=_(u"Indexed?")) associated_file__towns = get_town_field() - parcel = ParcelField(label=_("Parcel (section/number/public domain)")) + parcel = forms.CharField(label=_(u"Parcel")) if settings.ISHTAR_DPTS: associated_file__towns__numero_insee__startswith = forms.ChoiceField( label=_(u"Department"), choices=[]) act_object = forms.CharField(label=_(u"Object"), max_length=300) - signature_date_after = forms.DateField( - label=_(u"Signature date after"), widget=DatePicker) signature_date_before = forms.DateField( label=_(u"Signature date before"), widget=DatePicker) + signature_date_after = forms.DateField( + label=_(u"Signature date after"), widget=DatePicker) associated_file__name = forms.CharField( label=_(u"File name"), max_length=200) associated_file__general_contractor = forms.IntegerField( @@ -523,14 +527,6 @@ class AdministrativeActFileSelect(TableSelect): self.fields[k].choices = [ ('', '--')] + list(settings.ISHTAR_DPTS) - def get_input_ids(self): - ids = super(AdministrativeActFileSelect, self).get_input_ids() - ids.pop(ids.index('parcel')) - ids.append('parcel_0') - ids.append('parcel_1') - ids.append('parcel_2') - return ids - class AdministrativeActFileFormSelection(AdministrativeActOpeFormSelection): SEARCH_AND_SELECT = True |