summaryrefslogtreecommitdiff
path: root/archaeological_operations/forms.py
diff options
context:
space:
mode:
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
commit23b95b9d8de9037e40b0c79e9d0fdda1dba23d2b (patch)
treeb3a79525887488ca98e4adccbcab9538c0e6f9a5 /archaeological_operations/forms.py
parentd643afb7db26be3a697bfd0ab1ab2239ef7b1275 (diff)
downloadIshtar-23b95b9d8de9037e40b0c79e9d0fdda1dba23d2b.tar.bz2
Ishtar-23b95b9d8de9037e40b0c79e9d0fdda1dba23d2b.zip
Search administrativ act configuration
Diffstat (limited to 'archaeological_operations/forms.py')
-rw-r--r--archaeological_operations/forms.py18
1 files changed, 6 insertions, 12 deletions
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