diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-06-14 00:32:33 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-06-14 00:32:33 +0200 |
| commit | 0844c9a52a31f43d93e00910314803da603a4d5d (patch) | |
| tree | f8b9caa0926ef9be905f8b96b523acf8e9999800 /ishtar/furnitures | |
| parent | 464ef420c7fb3d8bb80d9f60e858580f27a18c80 (diff) | |
| download | Ishtar-0844c9a52a31f43d93e00910314803da603a4d5d.tar.bz2 Ishtar-0844c9a52a31f43d93e00910314803da603a4d5d.zip | |
Add some criteria to find search (closes #449)
Diffstat (limited to 'ishtar/furnitures')
| -rw-r--r-- | ishtar/furnitures/forms_items.py | 10 | ||||
| -rw-r--r-- | ishtar/furnitures/views.py | 3 |
2 files changed, 10 insertions, 3 deletions
diff --git a/ishtar/furnitures/forms_items.py b/ishtar/furnitures/forms_items.py index 2212ec253..6efb705e2 100644 --- a/ishtar/furnitures/forms_items.py +++ b/ishtar/furnitures/forms_items.py @@ -137,12 +137,16 @@ item_creation_wizard = ItemWizard([ class ItemSelect(forms.Form): base_items__context_record__parcel__town = get_town_field() base_items__context_record__parcel__operation__year = forms.IntegerField( - label=_("Year")) + label=_(u"Year")) + base_items__context_record__parcel__operation__code_patriarche = \ + forms.IntegerField(label=_(u"Code PATRIARCHE")) dating__period = forms.ChoiceField( - label=_("Period"), choices=models.Period.get_types()) + label=_(u"Period"), choices=models.Period.get_types()) + # TODO search by warehouse material_type = forms.ChoiceField( label=_("Material type"), choices=models.MaterialType.get_types()) - base_items__is_isolated = forms.NullBooleanField(label=_("Is isolated?")) + base_items__item__description = forms.CharField(label=_(u"Description")) + base_items__is_isolated = forms.NullBooleanField(label=_(u"Is isolated?")) class ItemFormSelection(forms.Form): form_label = _("Item search") diff --git a/ishtar/furnitures/views.py b/ishtar/furnitures/views.py index 31cb91767..7516fdcda 100644 --- a/ishtar/furnitures/views.py +++ b/ishtar/furnitures/views.py @@ -482,7 +482,10 @@ get_archaeologicalitem = get_item(models.Item, 'base_items__context_record__parcel__town', 'base_items__context_record__parcel__operation__year': 'base_items__context_record__parcel__operation__year__contains', +'base_items__context_record__parcel__operation__code_patriarche': + 'base_items__context_record__parcel__operation__code_patriarche', 'dating__period':'dating__period__pk', +'base_items__item__description':'base_items__item__description__icontains', 'base_items__is_isolated':'base_items__is_isolated'}) def autocomplete_warehouse(request): |