diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-01-28 20:55:15 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-01-28 20:55:15 +0100 |
| commit | 6fdfd66f9471be6a4cd549f171a631c8a07d9ff3 (patch) | |
| tree | 4887cfd13b760fa158c65416fd8d64272b53e3e2 /archaeological_context_records | |
| parent | c96d651ed4f9e752758eca4eb957a6d0e72d3a1d (diff) | |
| download | Ishtar-6fdfd66f9471be6a4cd549f171a631c8a07d9ff3.tar.bz2 Ishtar-6fdfd66f9471be6a4cd549f171a631c8a07d9ff3.zip | |
Allow to search by archaeological sites
Diffstat (limited to 'archaeological_context_records')
| -rw-r--r-- | archaeological_context_records/forms.py | 9 | ||||
| -rw-r--r-- | archaeological_context_records/views.py | 3 |
2 files changed, 10 insertions, 2 deletions
diff --git a/archaeological_context_records/forms.py b/archaeological_context_records/forms.py index 59f683620..98da5ce10 100644 --- a/archaeological_context_records/forms.py +++ b/archaeological_context_records/forms.py @@ -29,7 +29,8 @@ from django.forms.formsets import formset_factory from django.utils.translation import ugettext_lazy as _ from ishtar_common.models import valid_id -from archaeological_operations.models import Period, Parcel, Operation +from archaeological_operations.models import Period, Parcel, Operation, \ + ArchaeologicalSite import models from ishtar_common import widgets @@ -49,6 +50,12 @@ class RecordSelect(TableSelect): operation__year = forms.IntegerField(label=_(u"Operation's year")) operation__operation_code = forms.IntegerField( label=_(u"Operation's number (index by year)")) + archaeological_sites = forms.IntegerField( + label=_("Archaelogical site"), + widget=widgets.JQueryAutoComplete( + reverse_lazy('autocomplete-archaeologicalsite'), + associated_model=ArchaeologicalSite), + validators=[valid_id(ArchaeologicalSite)]) datings__period = forms.ChoiceField(label=_(u"Period"), choices=[]) unit = forms.ChoiceField(label=_(u"Unit type"), choices=[]) parcel = ParcelField(label=_(u"Parcel (section/number)")) diff --git a/archaeological_context_records/views.py b/archaeological_context_records/views.py index dc26fc507..883b2c85e 100644 --- a/archaeological_context_records/views.py +++ b/archaeological_context_records/views.py @@ -39,7 +39,8 @@ contextrecord_extra_keys = { 'datings__period': 'datings__period__pk', 'parcel_0': 'operation__parcels__section', 'parcel_1': 'operation__parcels__parcel_number', - 'label': 'label__icontains' + 'label': 'label__icontains', + 'archaeological_sites': 'operation__archaeological_sites__pk', } get_contextrecord = get_item( |