Merge branch 'main' into issue-7262

Author: kwhuber

specifyweb/backend/stored_queries/execution.py

@@ -51,20 +51,24 @@ class QuerySort:
     def by_id(sort_id: QUREYFIELD_SORT_T):
         return QuerySort.SORT_TYPES[sort_id]
 
+
+def DefaultQueryFormatterProps():
+    return ObjectFormatterProps(
+        format_agent_type=False,
+        format_picklist=False,
+        format_types=True,
+        numeric_catalog_number=True,
+        format_expr=True
+    )
+
 class BuildQueryProps(NamedTuple):
     recordsetid: int | None = None
     replace_nulls: bool = False
     formatauditobjs: bool = False
     distinct: bool = False
     series: bool = False
     implicit_or: bool = True
-    formatter_props: ObjectFormatterProps = ObjectFormatterProps(
-        format_agent_type = False,
-        format_picklist = False,
-        format_types = True,
-        numeric_catalog_number = True,
-        format_expr = True,
-    )
+    formatter_props: ObjectFormatterProps = DefaultQueryFormatterProps()
 
 
 def set_group_concat_max_len(connection):
@@ -789,10 +793,13 @@ def execute(
     offset,
     recordsetid=None,
     formatauditobjs=False,
-    formatter_props=ObjectFormatterProps(),
+    formatter_props=None,
 ):
     "Build and execute a query, returning the results as a data structure for json serialization"
 
+    if formatter_props is None:
+        formatter_props = DefaultQueryFormatterProps()
+
     set_group_concat_max_len(session.info["connection"])
     query, order_by_exprs = build_query(
         session,

specifyweb/backend/stored_queries/format.py

@@ -41,10 +41,10 @@
 Spauditlog_model = datamodel.get_table('SpAuditLog')
 
 class ObjectFormatterProps(NamedTuple):
-    format_agent_type: bool = False,
-    format_picklist: bool = False,
-    format_types: bool = True,
-    numeric_catalog_number: bool = True,
+    format_agent_type: bool = False
+    format_picklist: bool = False
+    format_types: bool = True
+    numeric_catalog_number: bool = True
     # format_expr determines if make_expr should call _fieldformat, like in versions before 7.10.2.
     # Batch edit expects it to be false to correctly handle some edge cases.
     format_expr: bool = False

specifyweb/backend/stored_queries/queryfieldspec.py

@@ -161,11 +161,28 @@ def get_workbench_name(self):
         # Treedef id included to make it easier to pass it to batch edit
         return f"{self.treedef_name}{RANK_KEY_DELIMITER}{self.name}{RANK_KEY_DELIMITER}{self.treedef_id}"
 
+def null_safe_not(field_expr, predicate):
+
+    """Return a NOT clause that still matches NULL values on the target field.
+
+    SQL's ``NOT IN`` and similar predicates exclude rows where the filtered column
+    is ``NULL``. Historical Specify 6 behaviour (and user expectation) is to keep
+    those "empty" rows when a negated filter is applied.  This helper wraps the
+    negated predicate in an OR that explicitly re-includes NULL rows for the
+    relevant field expression.
+
+    """
+    if predicate is None or isinstance(predicate, Query):
+        return predicate
+    target = field_expr if field_expr is not None else getattr(predicate, "left", None)
+    if target is None:
+        return sql.not_(predicate)
+    return sql.or_(target.is_(None), sql.not_(predicate))
+
 
 QueryNode = Field | Relationship | TreeRankQuery
 FieldSpecJoinPath = tuple[QueryNode]
 
-
 class QueryFieldSpec(
     namedtuple(
         "QueryFieldSpec",
@@ -383,6 +400,7 @@ def apply_filter(
 
             query_op = QueryOps(uiformatter)
             op = query_op.by_op_num(op_num)
+            mod_orm_field = orm_field
             if query_op.is_precalculated(op_num):
                 f = op(
                     orm_field, value, query, is_strict=strict
@@ -399,7 +417,10 @@ def apply_filter(
                 op, mod_orm_field, value = apply_special_filter_cases(orm_field, field, table, value, op, op_num, uiformatter, collection, user)
                 f = op(mod_orm_field, value)
 
-            predicate = sql.not_(f) if negate else f
+            if negate:
+                predicate = null_safe_not(mod_orm_field or orm_field, f)
+            else:
+                predicate = f
         else:
             predicate = None
 

specifyweb/frontend/js_src/lib/localization/preferences.ts

@@ -2091,13 +2091,13 @@ export const preferencesText = createDictionary({
     'en-us':
       'Catalog Number field need to be unique across Component and CO tables',
     'de-ch':
-      'Das Feld „Katalognummer“ muss in allen Komponenten- und CO-Tabellen eindeutig sein',
+      'Das Feld „Katalognummer“ muss in allen Komponenten- und CO-Tabellen eindeutig sein.',
     'es-es':
-      'El campo Número de catálogo debe ser único en las tablas de componentes y CO',
+      'El campo Número de catálogo debe ser único en las tablas de componentes y CO.',
     'fr-fr':
       'Le champ Numéro de catalogue doit être unique dans les tables Composant et CO',
     'pt-br':
-      'O campo Número de catálogo precisa ser exclusivo nas tabelas Componente e CO',
+      'O campo Número de Catálogo precisa ser único em todas as tabelas de Componente e CO.',
     'ru-ru':
       'Поле «Номер каталога» должно быть уникальным в таблицах «Компонент» и «CO».',
     'uk-ua':