From 56e42ad1dbe3bfd50853de937dcb6f155489fde4 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 12 Sep 2019 10:57:47 +0200 Subject: Fix display locks on tables queried with non optimized queries --- ishtar_common/views_item.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py index 6c10285db..c40b2c75f 100644 --- a/ishtar_common/views_item.py +++ b/ishtar_common/views_item.py @@ -1156,6 +1156,7 @@ def _get_data_from_query(items, query_table_cols, extra_request_keys, def _get_data_from_query_old(items, query_table_cols, request, extra_request_keys, do_not_deduplicate=False): c_ids, datas = [], [] + has_lock = items and hasattr(items[0], "locked") for item in items: # manual deduplicate when distinct is not enough @@ -1220,6 +1221,8 @@ def _get_data_from_query_old(items, query_table_cols, request, vals[idx], u' - ', _format_val(v))) my_vals = new_vals[:] data.append(u" & ".join(my_vals) or u"") + if has_lock: + data.append(item.locked) datas.append(data) return datas -- cgit v1.2.3