diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-03 20:17:47 +0100 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-02-03 20:17:47 +0100 | 
| commit | 507d9eb44c328e13ffff26e4301d7e80bfc91f4d (patch) | |
| tree | b497011ebb4ea4b899eb3c5ebeae6af15c2816c4 /archaeological_finds/forms.py | |
| parent | 7522e7a325fb8ebad5f20bbfb5253b4be24e2cd0 (diff) | |
| parent | 4509e950fbe35e6f529c4469dfc7802686fce28e (diff) | |
| download | Ishtar-507d9eb44c328e13ffff26e4301d7e80bfc91f4d.tar.bz2 Ishtar-507d9eb44c328e13ffff26e4301d7e80bfc91f4d.zip  | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_finds/forms.py')
| -rw-r--r-- | archaeological_finds/forms.py | 8 | 
1 files changed, 7 insertions, 1 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py index d61704259..1498d4028 100644 --- a/archaeological_finds/forms.py +++ b/archaeological_finds/forms.py @@ -29,7 +29,7 @@ from django.utils.safestring import mark_safe  from django.utils.translation import ugettext_lazy as _  from ishtar_common.models import Person, valid_id, valid_ids -from archaeological_operations.models import Period +from archaeological_operations.models import Period, ArchaeologicalSite  from archaeological_context_records.models import DatingType, DatingQuality  from archaeological_warehouse.models import Warehouse  import models @@ -153,6 +153,12 @@ class FindSelect(TableSelect):          label=_(u"Year"))      base_finds__context_record__operation__code_patriarche = \          forms.IntegerField(label=_(u"Code PATRIARCHE")) +    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=[])      # TODO search by warehouse      material_types = forms.ChoiceField(label=_(u"Material type"), choices=[])  | 
