diff options
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/models.py | 4 | ||||
| -rw-r--r-- | ishtar_common/models_common.py | 2 | ||||
| -rw-r--r-- | ishtar_common/models_imports.py | 1 | ||||
| -rw-r--r-- | ishtar_common/utils.py | 7 |
4 files changed, 10 insertions, 4 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py index abff81056..1ac95dd7e 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -5030,13 +5030,13 @@ class Document( query_own_list.append((rel_model + "__", q_own_dct)) q = None for prefix, owns in query_own_list: - subq = cls._construct_query_own(prefix, owns) + subq = cls._construct_query_own(cls, prefix, owns) if subq: if not q: q = subq else: q |= subq - q |= cls._construct_query_own("", [{"history_creator": ishtaruser.user_ptr}]) + q |= cls._construct_query_own(cls, "", [{"history_creator": ishtaruser.user_ptr}]) return q def get_associated_operation(self): diff --git a/ishtar_common/models_common.py b/ishtar_common/models_common.py index 6f995569c..91a3619ce 100644 --- a/ishtar_common/models_common.py +++ b/ishtar_common/models_common.py @@ -2427,7 +2427,7 @@ class GeoVectorData(Imported, OwnPerms): ): model = apps.get_model(app_label, model_name) sub_q = cls._construct_query_own( - "", model._get_query_owns_dicts(ishtaruser) + model, "", model._get_query_owns_dicts(ishtaruser) ) q2 = Q( source_id__in=list(sub_q.values_list("id", flat=True)), diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py index 5e29b98ed..cae04298b 100644 --- a/ishtar_common/models_imports.py +++ b/ishtar_common/models_imports.py @@ -1483,6 +1483,7 @@ class BaseImport(models.Model, OwnPerms, SheetItem): @classmethod def get_query_owns(cls, ishtaruser): return cls._construct_query_own( + cls, "", [ {"importer_type__users__pk": ishtaruser.pk}, diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py index e69ef0290..666e05bd9 100644 --- a/ishtar_common/utils.py +++ b/ishtar_common/utils.py @@ -530,12 +530,17 @@ class OwnPerms: return [] @classmethod - def _construct_query_own(cls, prefix, dct_list): + def _construct_query_own(cls, model, prefix, dct_list): q = None for subquery_dict in dct_list: subquery = None for k in subquery_dict: subsubquery = Q(**{prefix + k: subquery_dict[k]}) + # slice in multiple queries in order to prevent too complicated queries + subsubquery = Q(id__in=( + model.objects.filter(subsubquery).values_list("id", flat=True) + ) + ) if subquery: subquery |= subsubquery else: |