From 4cf9a28103c1f57ae745840a6baa78a33550b71a Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sun, 13 Feb 2022 17:24:21 +0000
Subject: [PATCH 1/2] .

---
 generic/templates/generic/cidusergroup_form.html | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/generic/templates/generic/cidusergroup_form.html b/generic/templates/generic/cidusergroup_form.html
index f845a73d..bce7df52 100755
--- a/generic/templates/generic/cidusergroup_form.html
+++ b/generic/templates/generic/cidusergroup_form.html
@@ -25,5 +25,7 @@ Use this form to create / edit a CID user group.
 
     <h3>Users</h3>
 
+    {{cidusergroup.ciduser_set}}
+
 </form>
 {% endblock %}
\ No newline at end of file

From c5999916eeb625fc4f8f9bd098625421d8a38f28 Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Sun, 13 Feb 2022 17:32:20 +0000
Subject: [PATCH 2/2] .

---
 generic/models.py                                | 6 ++++++
 generic/templates/generic/cidusergroup_form.html | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/generic/models.py b/generic/models.py
index 29c12083..af535a0b 100644
--- a/generic/models.py
+++ b/generic/models.py
@@ -461,3 +461,9 @@ class CidUserGroup(models.Model):
 
     def __str__(self) -> str:
         return str(self.name)
+
+    def GetGroupUsers(self):
+        cid_users = self.ciduser_set.all()
+
+        s = ", ".join([f"{user.id} - {user.name}" for user in cid_users])
+        return s
diff --git a/generic/templates/generic/cidusergroup_form.html b/generic/templates/generic/cidusergroup_form.html
index bce7df52..7caed1b3 100755
--- a/generic/templates/generic/cidusergroup_form.html
+++ b/generic/templates/generic/cidusergroup_form.html
@@ -25,7 +25,7 @@ Use this form to create / edit a CID user group.
 
     <h3>Users</h3>
 
-    {{cidusergroup.ciduser_set}}
+    {{cidusergroup.GetGroupUsers}}
 
 </form>
 {% endblock %}
\ No newline at end of file