From 9441541febfb919c00cb4e51335be316beb942a0 Mon Sep 17 00:00:00 2001
From: Ross <ross@xkjq.uk>
Date: Wed, 12 Nov 2025 22:11:43 +0000
Subject: [PATCH] Add grade display to selected users in UserUserGroupForm

---
 generic/forms.py | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/generic/forms.py b/generic/forms.py
index a6950557..91a3aaab 100755
--- a/generic/forms.py
+++ b/generic/forms.py
@@ -584,9 +584,21 @@ class UserUserGroupForm(ModelForm):
             selected_html = ""
             for u in users:
                 options_html += f'<option value="{u.pk}" selected>{u.get_full_name() or u.username} - {u.email}</option>'
+                # include grade display in the selected list if available
+                grade_text = ""
+                try:
+                    up = getattr(u, "userprofile", None)
+                    if up and getattr(up, "grade", None):
+                        g = up.grade
+                        grade_text = getattr(g, "name", str(g)) if g is not None else ""
+                except Exception:
+                    grade_text = ""
+
                 selected_html += (
                     f'<li id="selected_user_{self.name}_{u.pk}" class="list-group-item d-flex justify-content-between align-items-center">'
-                    f'<span>{u.get_full_name() or u.username} <small class="text-muted">{u.email}</small></span>'
+                    f'<span>{u.get_full_name() or u.username} <small class="text-muted">{u.email}</small>'
+                    + (f' <small class="text-muted ms-2">{grade_text}</small>' if grade_text else '')
+                    + '</span>'
                     f'<button type="button" class="btn btn-sm btn-outline-danger ms-2" onclick="removeUserFromField(\'{self.name}\', {u.pk})">Remove</button>'
                     f'</li>'
                 )