summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-02-23 16:17:59 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-02-23 16:20:25 +0100
commitf50ef2b482abbb571aec1508fa95458e309a3dc5 (patch)
tree50f916c34fd81eb871b524c0c709017ab31bf7fe
parent72c1fef0bb9cdb39f5c6f212ca6b6d44f8132fb1 (diff)
downloadIshtar-f50ef2b482abbb571aec1508fa95458e309a3dc5.tar.bz2
Ishtar-f50ef2b482abbb571aec1508fa95458e309a3dc5.zip
Improve modify / search panel for finds
-rw-r--r--archaeological_finds/forms.py5
-rw-r--r--archaeological_finds/views.py6
2 files changed, 10 insertions, 1 deletions
diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 198d69035..83a9e2da3 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.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
@@ -148,6 +148,9 @@ DatingFormSet.form_label = _("Dating")
class FindSelect(TableSelect):
+ base_finds__cache_short_id = forms.CharField(label=_(u"Short ID"))
+ base_finds__cache_complete_id = forms.CharField(label=_(u"Complete ID"))
+ label = forms.CharField(label=_(u"Free ID"))
base_finds__context_record__parcel__town = get_town_field()
base_finds__context_record__operation__year = forms.IntegerField(
label=_(u"Year"))
diff --git a/archaeological_finds/views.py b/archaeological_finds/views.py
index 5306e84a5..f09b3099b 100644
--- a/archaeological_finds/views.py
+++ b/archaeological_finds/views.py
@@ -35,6 +35,12 @@ from forms import *
import models
find_extra_keys = {
+ 'base_finds__cache_short_id':
+ 'base_finds__cache_short_id__icontains',
+ 'base_finds__cache_complete_id':
+ 'base_finds__cache_complete_id__icontains',
+ 'label':
+ 'label__icontains',
'base_finds__context_record':
'base_finds__context_record__pk',
'base_finds__context_record__parcel__town':