summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--archaeological_context_records/models.py4
-rw-r--r--archaeological_files/models.py2
-rw-r--r--archaeological_finds/models_finds.py9
-rw-r--r--archaeological_operations/models.py14
-rw-r--r--archaeological_warehouse/models.py2
-rw-r--r--ishtar_common/models.py4
-rw-r--r--ishtar_common/models_common.py2
-rw-r--r--ishtar_common/models_imports.py1
-rw-r--r--ishtar_common/utils.py7
9 files changed, 34 insertions, 11 deletions
diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index 8631f49d1..29e8b56a8 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -1236,13 +1236,15 @@ class ContextRecord(
def get_query_owns(cls, ishtaruser):
return (
cls._construct_query_own(
- "operation__", Operation._get_query_owns_dicts(ishtaruser)
+ cls, "operation__", Operation._get_query_owns_dicts(ishtaruser)
)
| cls._construct_query_own(
+ cls,
"base_finds__find__basket__",
[{"shared_with": ishtaruser, "shared_write_with": ishtaruser}],
)
| cls._construct_query_own(
+ cls,
"",
[
{"history_creator": ishtaruser.user_ptr},
diff --git a/archaeological_files/models.py b/archaeological_files/models.py
index 6f1640b46..5a5f4947e 100644
--- a/archaeological_files/models.py
+++ b/archaeological_files/models.py
@@ -1396,7 +1396,7 @@ class File(
@classmethod
def get_query_owns(cls, ishtaruser):
- return cls._construct_query_own("", cls._get_query_owns_dicts(ishtaruser))
+ return cls._construct_query_own(cls, "", cls._get_query_owns_dicts(ishtaruser))
def is_active(self):
return not bool(self.end_date)
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index f140c2d61..fa38a6dbb 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -3078,20 +3078,25 @@ class Find(
def _get_query_owns(cls, ishtaruser, prefix=""):
q = (
cls._construct_query_own(
- f"{prefix}container__location__", Warehouse._get_query_owns_dicts(ishtaruser)
+ cls, f"{prefix}container__location__",
+ Warehouse._get_query_owns_dicts(ishtaruser)
)
| cls._construct_query_own(
- f"{prefix}container__responsible__", Warehouse._get_query_owns_dicts(ishtaruser)
+ cls, f"{prefix}container__responsible__",
+ Warehouse._get_query_owns_dicts(ishtaruser)
)
| cls._construct_query_own(
+ cls,
f"{prefix}base_finds__context_record__operation__",
Operation._get_query_owns_dicts(ishtaruser),
)
| cls._construct_query_own(
+ cls,
f"{prefix}basket__",
[{"shared_with": ishtaruser, "shared_write_with": ishtaruser}],
)
| cls._construct_query_own(
+ cls,
"",
[
{f"{prefix}history_creator": ishtaruser.user_ptr},
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index 171b60513..d933944d1 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -889,32 +889,39 @@ class ArchaeologicalSite(
q = (
cls._construct_query_own(
+ cls,
"operations__context_record__base_finds__find__container__responsible__",
Warehouse._get_query_owns_dicts(ishtaruser),
)
| cls._construct_query_own(
+ cls,
"operations__context_record__base_finds__find__basket__",
[{"shared_with": ishtaruser, "shared_write_with": ishtaruser}],
)
| cls._construct_query_own(
+ cls,
"operations__context_record__base_finds__find__container__location__",
Warehouse._get_query_owns_dicts(ishtaruser),
)
| cls._construct_query_own(
+ cls,
"top_operations__context_record__base_finds__find__container__responsible__",
Warehouse._get_query_owns_dicts(ishtaruser),
)
| cls._construct_query_own(
+ cls,
"top_operations__context_record__base_finds__find__container__location__",
Warehouse._get_query_owns_dicts(ishtaruser),
)
| cls._construct_query_own(
+ cls,
"operations__", Operation._get_query_owns_dicts(ishtaruser, no_rel=True)
)
| cls._construct_query_own(
+ cls,
"top_operations__", Operation._get_query_owns_dicts(ishtaruser)
)
- | cls._construct_query_own("", cls._get_query_owns_dicts(ishtaruser))
+ | cls._construct_query_own(cls, "", cls._get_query_owns_dicts(ishtaruser))
)
return q
@@ -2378,18 +2385,21 @@ class Operation(
q = (
cls._construct_query_own(
+ cls,
"context_record__base_finds__find__container__responsible__",
Warehouse._get_query_owns_dicts(ishtaruser),
)
| cls._construct_query_own(
+ cls,
"context_record__base_finds__find__container__location__",
Warehouse._get_query_owns_dicts(ishtaruser),
)
| cls._construct_query_own(
+ cls,
"context_record__base_finds__find__basket__",
[{"shared_with": ishtaruser, "shared_write_with": ishtaruser}],
)
- | cls._construct_query_own("", cls._get_query_owns_dicts(ishtaruser))
+ | cls._construct_query_own(cls, "", cls._get_query_owns_dicts(ishtaruser))
)
return q
diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py
index bdd9e1ded..121e2bbb9 100644
--- a/archaeological_warehouse/models.py
+++ b/archaeological_warehouse/models.py
@@ -607,7 +607,7 @@ class Warehouse(
@classmethod
def get_query_owns(cls, ishtaruser):
- return cls._construct_query_own("", cls._get_query_owns_dicts(ishtaruser))
+ return cls._construct_query_own(cls, "", cls._get_query_owns_dicts(ishtaruser))
@classmethod
def _get_query_owns_dicts(cls, ishtaruser):
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 012bf920d..b5e6d705b 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -5510,13 +5510,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 8f6ff5338..e2495bcd5 100644
--- a/ishtar_common/models_common.py
+++ b/ishtar_common/models_common.py
@@ -2499,7 +2499,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)
)
if not sub_q:
continue
diff --git a/ishtar_common/models_imports.py b/ishtar_common/models_imports.py
index b1af1912f..55bbd1906 100644
--- a/ishtar_common/models_imports.py
+++ b/ishtar_common/models_imports.py
@@ -1491,6 +1491,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 4e80ac60a..cf58216a4 100644
--- a/ishtar_common/utils.py
+++ b/ishtar_common/utils.py
@@ -750,12 +750,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:
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-16 20:45:20 +0000