From c1f17bad749a03c487c90284e23e1d1d64e68737 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Cebell=C3=A1n=20S=C3=A1nchez?= <josecebe@gmail.com>
Date: Tue, 21 Sep 2021 10:40:29 +0200
Subject: [PATCH] SAK-46234 Add the ability to hide the filter membership by
 another group in manage groups

---
 .../org/sakaiproject/config/bundle/default.sakai.properties  | 5 +++++
 .../groupmanager/controller/GroupController.java             | 4 +++-
 .../src/main/webapp/WEB-INF/templates/group.html             | 2 +-
 .../org/sakaiproject/sitemanage/api/SiteManageConstants.java | 1 +
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties b/config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties
index 29124ed0678b..3fd7537ecf4a 100644
--- a/config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties
+++ b/config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties
@@ -3425,6 +3425,11 @@
 # DEFAULT: true
 # user_audit_log_display=true
 
+# SAK-34034 Filter by group in the Site Info Groups Management screen
+# DEFAULT: true (enabled)
+# Set to false to hide the filter in the Site Info Groups Management screen
+# siteinfo.group.filter.enabled=false
+
 ### Sites admin permissions tool
 ## You may want to adjust these values up if you have a massive number of sites
 ## or a lot of load on your server. These values are probably OK for maybe 10k sites.
diff --git a/site-manage/site-group-manager/src/main/java/org/sakaiproject/groupmanager/controller/GroupController.java b/site-manage/site-group-manager/src/main/java/org/sakaiproject/groupmanager/controller/GroupController.java
index 3e21479216c6..b3368979aee7 100644
--- a/site-manage/site-group-manager/src/main/java/org/sakaiproject/groupmanager/controller/GroupController.java
+++ b/site-manage/site-group-manager/src/main/java/org/sakaiproject/groupmanager/controller/GroupController.java
@@ -48,6 +48,7 @@
 import org.sakaiproject.site.util.SiteConstants;
 import org.sakaiproject.site.util.SiteGroupHelper;
 import org.sakaiproject.sitemanage.api.SiteHelper;
+import org.sakaiproject.sitemanage.api.SiteManageConstants;
 import org.sakaiproject.user.api.User;
 import org.sakaiproject.util.comparator.UserSortNameComparator;
 
@@ -193,7 +194,8 @@ public String showGroup(Model model,
         model.addAttribute("joinableSetList", joinableSetList);
         model.addAttribute("siteMemberList", siteMemberList);
         model.addAttribute("groupList", groupList);
-        model.addAttribute("sectionList", sectionList);        
+        model.addAttribute("sectionList", sectionList);
+        model.addAttribute("groupFilterEnabled", sakaiService.getBooleanProperty(SiteManageConstants.PROP_SITEINFO_GROUP_FILTER_ENABLED, true));
 
         return GroupManagerConstants.GROUP_TEMPLATE;
     }
diff --git a/site-manage/site-group-manager/src/main/webapp/WEB-INF/templates/group.html b/site-manage/site-group-manager/src/main/webapp/WEB-INF/templates/group.html
index af150b64f5ca..028b58ede2d5 100644
--- a/site-manage/site-group-manager/src/main/webapp/WEB-INF/templates/group.html
+++ b/site-manage/site-group-manager/src/main/webapp/WEB-INF/templates/group.html
@@ -65,7 +65,7 @@ <h1 th:if="${groupForm.groupId != null}" th:text="#{groups.header.edit}"></h1>
           </div>
         </div>
       </div>
-      <div class="form-group row" th:if="${!groupList.isEmpty() || !sectionList.isEmpty()}">
+      <div class="form-group row" th:if="${groupFilterEnabled && (!groupList.isEmpty() || !sectionList.isEmpty())}">
         <div class="col-sm-8">
           <label for="groupMembershipFilter" class="form-control-label block" th:text="#{groups.filter.membership}">Filter membership</label>
           <select class="form-control" id="groupMembershipFilter" th:field="*{filterByGroupId}">
diff --git a/site-manage/site-manage-api/api/src/java/org/sakaiproject/sitemanage/api/SiteManageConstants.java b/site-manage/site-manage-api/api/src/java/org/sakaiproject/sitemanage/api/SiteManageConstants.java
index 5c91873886f3..3780d3522e5c 100644
--- a/site-manage/site-manage-api/api/src/java/org/sakaiproject/sitemanage/api/SiteManageConstants.java
+++ b/site-manage/site-manage-api/api/src/java/org/sakaiproject/sitemanage/api/SiteManageConstants.java
@@ -22,6 +22,7 @@ public class SiteManageConstants {
     public static final String RESOURCES_TOOL_ID = "sakai.resources";
     public static final String GRADEBOOK_TOOL_ID = "sakai.gradebookng";
     public static final String CALENDAR_TOOL_ID = "sakai.calendar";
+    public static final String PROP_SITEINFO_GROUP_FILTER_ENABLED = "siteinfo.group.filter.enabled";
 
     private SiteManageConstants() {
         throw new RuntimeException(this.getClass().getCanonicalName() + " is not to be instantiated");