✨ mask AnonymousUser in person results

2 files changed, 13 insertions, 8 deletions

diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index dbd4ba72a..94d86b171 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -3131,6 +3131,7 @@ class Person(Address, Merge, OwnPerms, ValueGetter, MainItem):
         "ishtaruser__isnull": "ishtaruser__isnull",
         "attached_to": "attached_to",
     }
+    BASE_REQUEST_EXCLUDE = {"name": "AnonymousUser", "surname": "AnonymousUser"}
 
     # alternative names of fields for searches
     ALT_NAMES = {
diff --git a/ishtar_common/views_item.py b/ishtar_common/views_item.py
index a925e71ce..f5ab7bae4 100644
--- a/ishtar_common/views_item.py
+++ b/ishtar_common/views_item.py
@@ -2395,7 +2395,7 @@ def execute_queries(
     distinct_queries, query_parameters, my_relation_types_prefix, my_bool_fields,
     my_reversed_bool_fields, related_name_fields, many_counted_fields,
     reversed_many_counted_fields, my_dated_fields, datetime_fields,
-    my_number_fields, and_reqs, data_type, operator
+    my_number_fields, and_reqs, data_type, operator, excluded_dct
         ):
     if isinstance(groups, tuple):
         operator, groups = groups
@@ -2417,7 +2417,7 @@ def execute_queries(
                 my_reversed_bool_fields, related_name_fields,
                 many_counted_fields, reversed_many_counted_fields,
                 my_dated_fields, datetime_fields, my_number_fields, and_reqs,
-                data_type, operator)
+                data_type, operator, excluded_dct)
             items = __operator_query(model, items, sub_items, operator)
             continue
 
@@ -2428,7 +2428,7 @@ def execute_queries(
             sub_dct, distinct_queries, query_parameters, my_relation_types_prefix,
             my_bool_fields, my_reversed_bool_fields, related_name_fields,
             many_counted_fields, reversed_many_counted_fields, my_dated_fields,
-            datetime_fields, my_number_fields, and_reqs, data_type, operator)
+            datetime_fields, my_number_fields, and_reqs, data_type, operator, excluded_dct)
     return items
 
 
@@ -2437,14 +2437,14 @@ def execute_query(
     distinct_queries, query_parameters, my_relation_types_prefix,
     my_bool_fields, my_reversed_bool_fields, related_name_fields,
     many_counted_fields, reversed_many_counted_fields, my_dated_fields,
-    datetime_fields, my_number_fields, and_reqs, data_type, operator
+    datetime_fields, my_number_fields, and_reqs, data_type, operator, excluded_dct
         ):
     query, exc_query, extras = main_manager(
         request, model, query_own, full, sub_dct, distinct_queries,
         query_parameters, my_relation_types_prefix, my_bool_fields,
         my_reversed_bool_fields, related_name_fields, many_counted_fields,
         reversed_many_counted_fields, my_dated_fields, datetime_fields,
-        my_number_fields, and_reqs[:]
+        my_number_fields, and_reqs[:], excluded_dct
     )
     sub_items = model.objects.filter(query)
     for d_q in distinct_queries:
@@ -2496,9 +2496,9 @@ def main_manager(
     request, model, query_own, full, dct, distinct_queries, query_parameters,
     my_relation_types_prefix, my_bool_fields, my_reversed_bool_fields,
     related_name_fields, many_counted_fields, reversed_many_counted_fields,
-    my_dated_fields, datetime_fields, my_number_fields, and_reqs
+    my_dated_fields, datetime_fields, my_number_fields, and_reqs,
+    excluded_dct
         ):
-    excluded_dct = {}
     or_reqs = []
     exc_and_reqs, exc_or_reqs = [], []
     dct, excluded_dct, distinct_queries = _search_manage_search_vector(
@@ -2754,6 +2754,9 @@ def get_item(
             my_base_request = copy(base_request)
         else:
             my_base_request = {}
+        excluded_dct = {}
+        if hasattr(model, "BASE_REQUEST_EXCLUDE"):
+            excluded_dct = copy(model.BASE_REQUEST_EXCLUDE)
         if not bool_fields and hasattr(model, "BOOL_FIELDS"):
             my_bool_fields = model.BOOL_FIELDS[:]
         else:
@@ -3091,7 +3094,8 @@ def get_item(
             my_relation_types_prefix, my_bool_fields, my_reversed_bool_fields,
             related_name_fields, many_counted_fields,
             reversed_many_counted_fields, my_dated_fields, datetime_fields,
-            my_number_fields, and_reqs, data_type, operator)
+            my_number_fields, and_reqs, data_type, operator,
+            excluded_dct)
 
         if return_query:
             return items