summaryrefslogtreecommitdiff
path: root/ishtar_common/views.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-09-21 18:19:06 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-09-21 18:19:06 +0200
commit7d177b5084b5bebed64cabf74378c5178ccc454d (patch)
treed9ae5b85b6a6e50a51c473679ba90dc9a8f21526 /ishtar_common/views.py
parent24f581e9f6f24184443e7ee97b8bdd94875ff0d6 (diff)
downloadIshtar-7d177b5084b5bebed64cabf74378c5178ccc454d.tar.bz2
Ishtar-7d177b5084b5bebed64cabf74378c5178ccc454d.zip
Add object type as a hierarchical search (refs #3742)
Diffstat (limited to 'ishtar_common/views.py')
-rw-r--r--ishtar_common/views.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 0ee57364b..997acd7df 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -587,7 +587,7 @@ def format_val(val):
HIERARCHIC_LEVELS = 5
HIERARCHIC_FIELDS = ['periods', 'period', 'unit', 'material_types',
- 'material_type', 'conservatory_state']
+ 'material_type', 'conservatory_state', 'object_types']
def _get_values(request, val):
@@ -677,6 +677,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
fields = [model._meta.get_field(k)
for k in get_all_field_names(model)]
+
request_keys = dict([
(field.name,
field.name + (hasattr(field, 'rel') and field.rel and '__pk'
@@ -733,6 +734,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[],
q = Q(**{req_key: val})
reqs |= q
and_reqs.append(reqs)
+
pinned_search = ""
if 'submited' not in request_items and full != 'shortcut':
# default search