From aa50f469842b9687c74df8765d72241e6e37d32c Mon Sep 17 00:00:00 2001
From: David Stirling <dstirling@glencoesoftware.com>
Date: Fri, 20 Sep 2024 16:35:30 +0100
Subject: [PATCH 1/2] Allow users to click a group name to show all users in
 that group

---
 .../webclient/base/includes/group_user_content.html         | 6 +++++-
 .../webclient/base/includes/group_user_dropdown2.html       | 2 --
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/omeroweb/webclient/templates/webclient/base/includes/group_user_content.html b/omeroweb/webclient/templates/webclient/base/includes/group_user_content.html
index 45dfff790e..6d69a37316 100644
--- a/omeroweb/webclient/templates/webclient/base/includes/group_user_content.html
+++ b/omeroweb/webclient/templates/webclient/base/includes/group_user_content.html
@@ -28,7 +28,11 @@
 
 {% for grp in myGroups %}
     <li {% if grp.id == eContext.context.groupId %}class="current_group"{% endif %}>
-        <a href="#" data-gid="{{ grp.id }}">
+        {% if grp.id == active_group.id %}
+            <a href="{{ current_url }}?experimenter=-1" data-gid="{{ grp.id }}">
+        {% else %}
+            <a href="{% url 'change_active_group' %}?active_group={{grp.id}}&url={{ current_url }}?experimenter=-1" data-gid="{{ grp.id }}">
+        {% endif %}
             <img
             {% if grp.getDetails.getPermissions.isGroupWrite %} src="{% static 'webclient/image/group_green16.png' %}"
             {% else %}
diff --git a/omeroweb/webclient/templates/webclient/base/includes/group_user_dropdown2.html b/omeroweb/webclient/templates/webclient/base/includes/group_user_dropdown2.html
index 7ed28f2424..32bce7a600 100644
--- a/omeroweb/webclient/templates/webclient/base/includes/group_user_dropdown2.html
+++ b/omeroweb/webclient/templates/webclient/base/includes/group_user_dropdown2.html
@@ -53,11 +53,9 @@
 
                         // When hover or click on a Group, show Users...
                         $( "#groupList" ).on( "mouseenter click", "li a", function(event) {
-                            event.preventDefault();
                             var gid = $(this).attr("data-gid");
                             $usersList.hide();
                             $("#groupMembers-" + gid).show();
-                            return false;
                         });
                     });
                 }

From dd2879608e047a7d71a648a23e6955ce591950fd Mon Sep 17 00:00:00 2001
From: David Stirling <dstirling@glencoesoftware.com>
Date: Fri, 1 Nov 2024 13:33:09 +0000
Subject: [PATCH 2/2] Changes from @will-moore

---
 .../webclient/base/includes/group_user_content.html       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/omeroweb/webclient/templates/webclient/base/includes/group_user_content.html b/omeroweb/webclient/templates/webclient/base/includes/group_user_content.html
index 6d69a37316..37ba50f92a 100644
--- a/omeroweb/webclient/templates/webclient/base/includes/group_user_content.html
+++ b/omeroweb/webclient/templates/webclient/base/includes/group_user_content.html
@@ -28,10 +28,10 @@
 
 {% for grp in myGroups %}
     <li {% if grp.id == eContext.context.groupId %}class="current_group"{% endif %}>
-        {% if grp.id == active_group.id %}
-            <a href="{{ current_url }}?experimenter=-1" data-gid="{{ grp.id }}">
+        {% if grp.id == ome.active_group %}
+            <a href="#" data-gid="{{ grp.id }}">
         {% else %}
-            <a href="{% url 'change_active_group' %}?active_group={{grp.id}}&url={{ current_url }}?experimenter=-1" data-gid="{{ grp.id }}">
+            <a href="{% url 'change_active_group' %}?active_group={{grp.id}}" data-gid="{{ grp.id }}">
         {% endif %}
             <img
             {% if grp.getDetails.getPermissions.isGroupWrite %} src="{% static 'webclient/image/group_green16.png' %}"
@@ -54,7 +54,7 @@
 
     {% for grp in groups %}
         <li {% if grp.id == eContext.context.groupId %}class="current_group"{% endif %}>
-            <a href="#" data-gid="{{ grp.id }}">
+            <a href="{% url 'change_active_group' %}?active_group={{grp.id}}&url={{ current_url }}?experimenter=-1" data-gid="{{ grp.id }}">
                 <img
                 {% if grp.getDetails.getPermissions.isGroupWrite %} src="{% static 'webclient/image/group_green16.png' %}"
                 {% else %}