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 | 7157eccfa146c4b2d85e98e10ef8d244509769b7 (patch) | |
| tree | 4887cfd13b760fa158c65416fd8d64272b53e3e2 /archaeological_finds | |
| parent | c31e7d69af0ed9a223ff0319d9d004549e500f4a (diff) | |
| download | Ishtar-7157eccfa146c4b2d85e98e10ef8d244509769b7.tar.bz2 Ishtar-7157eccfa146c4b2d85e98e10ef8d244509769b7.zip | |
Allow to search by archaeological sites
Diffstat (limited to 'archaeological_finds')
| -rw-r--r-- | archaeological_finds/forms.py | 8 | ||||
| -rw-r--r-- | archaeological_finds/views.py | 4 |
2 files changed, 10 insertions, 2 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=[]) diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py index 134a17943..5306e84a5 100644 --- a/archaeological_finds/views.py +++ b/archaeological_finds/views.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2010-2015 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2010-2016 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -43,6 +43,8 @@ find_extra_keys = { 'base_finds__context_record__operation__year__contains', 'base_finds__context_record__operation': 'base_finds__context_record__operation__pk', + 'archaeological_sites': + 'base_finds__context_record__operation__archaeological_sites__pk', 'base_finds__context_record__operation__code_patriarche': 'base_finds__context_record__operation__code_patriarche', 'datings__period': 'datings__period__pk', |