minor refactoring for the dashboard reference fields formatting, thanks Nico

Author: mdipierro

apps/_dashboard/__init__.py

@@ -153,30 +153,18 @@ def make_grid():
                 field.readable = True
                 field.writable = True
                 # Make reference fields clickable
-                if field.type.startswith("reference ") or field.type.startswith("big-reference "):
-                    referenced_table_name = field.type.split()[1]
-                    # Create a custom represent function that returns a clickable link
-                    def make_reference_represent(ref_table_name, app_n, db_n):
-                        def represent(value, row):
-                            if not value:
-                                return ""
-                            ref_table = db[ref_table_name]
-                            ref_row = ref_table(value)
-                            if not ref_row:
-                                return f"#{value}(missing)"
-                            # Get display text using table format
-                            if isinstance(ref_table._format, str):
-                                display_text = ref_table._format % ref_row
-                            elif callable(ref_table._format):
-                                display_text = ref_table._format(ref_row)
-                            else:
-                                display_text = str(value)
-                            # Create link to the referenced record's table
-                            link_url = URL("dbadmin", app_n, db_n, ref_table_name, vars=dict(id=value))
-                            return XML(f'<a href="{link_url}">{display_text}</a>')
-                        return represent
-                    field.represent = make_reference_represent(referenced_table_name, app_name, db_name)
-            
+                if field.type_name in ("reference", "big-reference"):
+                    field.represent = make_admin_reference_represent(
+                        app_name, db_name, db, field
+                    )
+                elif field.type_name in ("list:reference"):
+                    representer = make_admin_reference_represent(
+                        app_name, db_name, db, field
+                    )
+                    field.represent = lambda values, _: [
+                        representer(item, _) for item in values
+                    ]
+
             columns = [
                 field
                 for field in table

apps/_dashboard/utils.py

@@ -19,6 +19,9 @@
 import tarfile
 import datetime
 
+from py4web import URL
+from yatl.helpers import A
+
 __all__ = (
     "safe_join",
     "list_dir",
@@ -33,6 +36,7 @@
     "get_commits",
     "get_branches",
     "is_git_repo",
+    "make_admin_reference_represent",
 )
 
 
@@ -207,3 +211,39 @@ def get_branches(cwd="."):
 def is_git_repo(cwd="."):
     """Checks if the cwd is a git repo"""
     return os.path.exists(os.path.join(cwd, ".git/config"))
+
+
+def fieldformat(table, row):
+    """
+    Given a table and a record, returns a string representation for the record
+    Compatible with pydal.helpers.methods._fieldformat
+    """
+    format = getattr(table, "_format", None)
+    if format:
+        if isinstance(format, str):
+            return table._format % row
+        elif callable(table._format):
+            return table._format(row)
+        else:
+            raise NotImplementedError
+    return str(row.id)
+
+
+# Create a custom represent function that returns a clickable link
+def make_admin_reference_represent(app_name, db_name, db, field):
+    def represent(value, _):
+        if not value:
+            return ""
+        ref_table = field.referenced_table()
+        ref_row = ref_table(value)
+        if not ref_row:
+            return f"#{value}(missing)"
+        # Create text to be displayed
+        display_text = fieldformat(ref_table, ref_row)
+        # Create link to the referenced record's table
+        link_url = URL(
+            "dbadmin", app_name, db_name, ref_table._tablename, vars=dict(id=value)
+        )
+        return A(display_text, _href=link_url)
+
+    return represent

apps/fadebook/controllers.py

@@ -82,7 +82,7 @@ def friends():
     # a search form (simply by first name)
     form = Form([Field("name", required=True)])
     users = []
-    if form.accepted:
+    if form.accepted and form.vars.get("name"):
         # select users based on the tokens in the search input
         query = None
         for token in form.vars.get("name").split():