From 23b95b9d8de9037e40b0c79e9d0fdda1dba23d2b Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 10 Aug 2018 12:59:00 +0200 Subject: Search administrativ act configuration --- archaeological_operations/forms.py | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'archaeological_operations/forms.py') diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index dc389c81c..d57a890eb 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -471,7 +471,7 @@ RecordRelationsFormSet.form_admin_name = _(u"Operation - 080 - Relations") RecordRelationsFormSet.form_slug = "operation-080-relations" -class OperationSelect(TableSelect): +class OperationSelect(TableSelect): # OK _model = models.Operation search_vector = forms.CharField( @@ -1230,7 +1230,7 @@ class OperationDeletionForm(FinalForm): ######### -class SiteSelect(TableSelect): +class SiteSelect(TableSelect): # OK _model = models.ArchaeologicalSite search_vector = forms.CharField( @@ -1376,7 +1376,9 @@ class SiteUnderwaterForm(ManageOldType): ################################################ -class AdministrativeActOpeSelect(TableSelect): +class AdministrativeActOpeSelect(TableSelect): # OK + _model = models.AdministrativeAct + search_vector = forms.CharField( label=_(u"Full text search"), widget=widgets.SearchWidget( 'archaeological-operations', 'administrativeact' @@ -1393,7 +1395,7 @@ class AdministrativeActOpeSelect(TableSelect): act_type = forms.ChoiceField(label=_("Act type"), choices=[]) indexed = forms.NullBooleanField(label=_(u"Indexed?")) operation__towns = get_town_field() - parcel = ParcelField(label=_("Parcel (section/number/public domain)")) + parcel = forms.CharField(label=_(u"Parcel")) if settings.ISHTAR_DPTS: operation__towns__numero_insee__startswith = forms.ChoiceField( label=_(u"Department"), choices=[]) @@ -1424,14 +1426,6 @@ class AdministrativeActOpeSelect(TableSelect): self.fields[k].choices = [ ('', '--')] + list(settings.ISHTAR_DPTS) - def get_input_ids(self): - ids = super(AdministrativeActOpeSelect, self).get_input_ids() - ids.pop(ids.index('parcel')) - ids.append('parcel_0') - ids.append('parcel_1') - ids.append('parcel_2') - return ids - class AdministrativeActOpeFormSelection(IshtarForm): SEARCH_AND_SELECT = True -- cgit v1.2.3