diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-09-12 10:57:47 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2019-09-12 10:57:47 +0200 |
| commit | 53bc30c87385c4332a7b6674c0b4887481f4c65b (patch) | |
| tree | a5eb422a8609dc386ff620a95247a20f9d5caa5b | |
| parent | 1713ea6f95111cd657f9dd519807dd3c9204323c (diff) | |
| download | Ishtar-53bc30c87385c4332a7b6674c0b4887481f4c65b.tar.bz2 Ishtar-53bc30c87385c4332a7b6674c0b4887481f4c65b.zip | |
Fix display locks on tables queried with non optimized queries
| -rw-r--r-- | ishtar_common/views_item.py | 3 |
1 files changed, 3 insertions, 0 deletions
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 |