From a01598e088392a0090cc9006434f1f614c437e52 Mon Sep 17 00:00:00 2001
From: Aaron Kable <aaronkable@gmail.com>
Date: Thu, 8 Jan 2026 21:03:45 +0800
Subject: [PATCH] tidy up casting

---
 allianceauth/framework/datatables.py | 42 ++++++++++++++++++++++------
 1 file changed, 34 insertions(+), 8 deletions(-)

diff --git a/allianceauth/framework/datatables.py b/allianceauth/framework/datatables.py
index 487a6cd9..4d562b50 100644
--- a/allianceauth/framework/datatables.py
+++ b/allianceauth/framework/datatables.py
@@ -15,15 +15,31 @@ logger = get_extension_logger(__name__)
 
 
 class nested_param_dict(dict):
+    """
+    Helper to create infinite depth default dicts for setting from params
+    """
     def __setitem__(self, item, value):
         if "." in item:
             head, path = item.split(".", 1)
+            try:
+                head = int(head)
+            except ValueError:
+                pass
             obj = self.setdefault(head, nested_param_dict())
             obj[path] = value
         else:
             super().__setitem__(item, value)
 
 
+def defaultdict_to_dict(d):
+    """
+    Helper to convert default dict back to dict
+    """
+    if isinstance(d, defaultdict):
+        d = {k: defaultdict_to_dict(v) for k, v in d.items()}
+    return d
+
+
 class DataTablesView(View):
 
     model: Model = None
@@ -38,27 +54,37 @@ class DataTablesView(View):
         for id, c in table_conf["columns"].items():
             _c = self.columns[int(id)][0]
             if c["searchable"] and len(_c) > 0:
-                if len(c["search"]["value"]) and len(_c):
+                _sv = str(c["search"]["value"])
+                if len(_sv) > 0:
                     if c["search"]["regex"]:
-                        filter_qs |= Q(**{f'{_c}__iregex': c["search"]["value"]})
+                        filter_qs |= Q(**{f'{_c}__iregex': _sv})
                     else:
-                        filter_qs |= Q(**{f'{_c}__icontains': c["search"]["value"]})
-                if len(table_conf["search"]["value"]) > 0:
-                    filter_qs |= Q(**{f'{_c}__icontains': table_conf["search"]["value"]})
+                        filter_qs |= Q(**{f'{_c}__icontains': _sv})
+                _gsv = str(table_conf["search"]["value"])
+                if len(_gsv) > 0:
+                    filter_qs |= Q(**{f'{_c}__icontains': _gsv})
         return filter_qs
 
     def get_table_config(self, get: dict):
         _cols = nested_param_dict()
         for c, v in get.items():
             _keys = [_k for _k in c.replace("]", "").split("[")]
-            _cols[".".join(_keys)] = v
-        return _cols
+            _v = v
+            if v in ["true", "false"]:
+                _v = _v == "true"
+            else:
+                try:
+                    _v = int(_v)
+                except ValueError:
+                    pass # not an integer
+            _cols[".".join(_keys)] = _v
+        return defaultdict_to_dict(_cols)
 
     def get_order(self, table_conf: dict):
         order = []
         for oc, od in table_conf["order"].items():
             _c = table_conf["columns"][od["column"]]
-            if _c["orderable"] == "true":
+            if _c["orderable"]:
                 if od["dir"] == "desc":
                     order.append("-" + self.columns[int(od["column"])][0])
                 else: