diff options
| -rw-r--r-- | archaeological_context_records/tests.py | 6 | ||||
| -rw-r--r-- | ishtar_common/views_item.py | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/archaeological_context_records/tests.py b/archaeological_context_records/tests.py index cf117285d..fef557cf3 100644 --- a/archaeological_context_records/tests.py +++ b/archaeological_context_records/tests.py @@ -496,10 +496,12 @@ class ContextRecordTest(ContextRecordInit, TestCase): profile.contextrecord_custom_index = 'operation_id' profile.save() cr1 = self.context_records[0] + cr1 = models.ContextRecord.objects.get(pk=cr1.pk) cr1.save() cr1 = models.ContextRecord.objects.get(pk=cr1.pk) self.assertEqual(cr1.custom_index, 1) cr2 = self.context_records[1] + cr2 = models.ContextRecord.objects.get(pk=cr2.pk) cr2.operation = cr1.operation cr2.save() cr2 = models.ContextRecord.objects.get(pk=cr2.pk) @@ -664,7 +666,9 @@ class ContextRecordSearchTest(ContextRecordInit, TestCase, SearchText): 2) # export response = c.get(reverse('get-contextrecord-full', - kwargs={'type': 'csv'}), {'submited': '1'}) + kwargs={'type': 'csv'}), + {'submited': '1', + 'operation__year': 2010, rel_key: rel_ope.label}) ENCODING = settings.ENCODING or 'utf-8' content = response.content.decode(ENCODING) # 2 lines + header diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py index 677dcbe18..0b803b00e 100644 --- a/ishtar_common/views_item.py +++ b/ishtar_common/views_item.py @@ -1644,9 +1644,11 @@ def get_item(model, func_name, default_name, extra_request_keys=None, and_reqs.append(reqs) pinned_search = "" + base_keys = ['extras', 'and_reqs', 'exc_and_reqs'] + if my_base_request: + base_keys += list(my_base_request) has_a_search = any( - k for k in dct.values() - if k not in ('extras', 'and_reqs', 'exc_and_reqs')) + k for k in dct.keys() if k not in my_base_request) # manage default and pinned search and not bookmark if not has_a_search and not request_items.get("search_vector", "") \ and full != 'shortcut': |