Add grade display to selected users in UserUserGroupForm
This commit is contained in:
+13
-1
@@ -584,9 +584,21 @@ class UserUserGroupForm(ModelForm):
|
|||||||
selected_html = ""
|
selected_html = ""
|
||||||
for u in users:
|
for u in users:
|
||||||
options_html += f'<option value="{u.pk}" selected>{u.get_full_name() or u.username} - {u.email}</option>'
|
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 += (
|
selected_html += (
|
||||||
f'<li id="selected_user_{self.name}_{u.pk}" class="list-group-item d-flex justify-content-between align-items-center">'
|
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'<button type="button" class="btn btn-sm btn-outline-danger ms-2" onclick="removeUserFromField(\'{self.name}\', {u.pk})">Remove</button>'
|
||||||
f'</li>'
|
f'</li>'
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user