Expose relation fields in the champ pickers and fix their column resolution

data_definition_options() used to exclude relation-type fields from its field list entirely, so a filter/binding could never reference "the linked object" of a row — and even when a relation field's clean name was typed manually (as the earlier "level.parcour" example needed), it silently matched nothing: every column lookup for a filter/repeater field used the field's own name, but a relation is actually stored in a "<field>_id" column (see create_definition.py), so the lookup always missed.

Relation fields now appear in the champ dropdowns (Répéteur's filtre_champ/filtre2_champ, Donnée liée's data_filtre_champ/data_filtre2_champ) labeled with the object they point to (e.g. "parcour (→ parcours)"), and a new _field_column() helper in filter_repeater_rows.py resolves the right "<field>_id" column whenever the field turns out to be a relation — used consistently by the filter comparison itself, the "{{Objet.champ}}" dynamic-value resolver, the repeater's row content ({{champ}}), and the Donnée liée row context. Jauge's own champ/champ_nom pickers (which need an actual displayable value, not an id) still exclude relations, both server- and client-side.

Verified end to end: the dropdown shows the relation field with its target-object label, and filtering "level" rows by the clean relation field name "parcour" (not "parcour_id") against a dynamic {{game.current_parcours}} reference now actually matches, alongside the existing "number" filter. Full suite green (89).
This commit is contained in:
william
2026-08-25 06:48:04 +02:00
parent 343732d7aa
commit aa3be503ce
6 changed files with 66 additions and 15 deletions
+19 -5
View File
@@ -6,6 +6,15 @@ from .data_definition_options import data_definition_options
from ..element_types.list_element_types import list_element_types
def _field_label(f):
"""Libellé affiché dans une liste déroulante de champs — précise l'objet
visé pour un champ "relation" (ex. "parcour (→ parcours)"), pour qu'on
sache ce qu'on choisit sans avoir à aller vérifier dans l'objet."""
if f["type"] == "relation" and f.get("relation_definition_name"):
return f"{f['name']} (→ {f['relation_definition_name']})"
return f["name"]
def controls_with_values(slug, el):
"""Pour le panneau de propriétés : la liste des réglages du widget de
cet élément, chacun avec sa valeur actuelle déjà résolue. Le réglage
@@ -38,11 +47,16 @@ def controls_with_values(slug, el):
control["options"] = [("", "(aucun — utiliser le modèle de texte ci-dessous)")] + [(str(t["id"]), t["name"]) for t in types]
if control["key"] == "row_id":
control["options"] = [("", "(sélectionner un objet d'abord)")] + [(str(r["id"]), r["label"]) for r in jauge_options["rows"]]
if control["key"] in ("champ", "filtre_champ", "filtre2_champ"):
control["options"] = [("", "(sélectionner un objet d'abord)")] + [(f["name"], f["name"]) for f in jauge_options["fields"]]
if control["key"] == "champ_nom":
control["options"] = [("", "— aucun —")] + [(f["name"], f["name"]) for f in jauge_options["fields"]]
if control["key"] in ("champ", "champ_nom"):
# La Jauge affiche une VALEUR (champ) ou un NOM (champ_nom) tel
# quel — un champ "relation" n'y a pas de sens (c'est un id, pas
# une valeur à afficher), donc exclu ici uniquement.
non_relation_fields = [f for f in jauge_options["fields"] if f["type"] != "relation"]
empty_label = "— aucun —" if control["key"] == "champ_nom" else "(sélectionner un objet d'abord)"
control["options"] = [("", empty_label)] + [(f["name"], _field_label(f)) for f in non_relation_fields]
if control["key"] in ("filtre_champ", "filtre2_champ"):
control["options"] = [("", "(sélectionner un objet d'abord)")] + [(f["name"], _field_label(f)) for f in jauge_options["fields"]]
if control["key"] in ("data_filtre_champ", "data_filtre2_champ"):
control["options"] = [("", "(sélectionner un objet d'abord)")] + [(f["name"], f["name"]) for f in data_binding_options["fields"]]
control["options"] = [("", "(sélectionner un objet d'abord)")] + [(f["name"], _field_label(f)) for f in data_binding_options["fields"]]
result.append({**control, "value": _control_value(el, control)})
return result