From d63ae115511ce89e929887543337d8f70a047a48 Mon Sep 17 00:00:00 2001
From: Sahil Batra <sahil@zulip.com>
Date: Sat, 2 Nov 2024 08:45:32 +0530
Subject: [PATCH] settings: Make separate section for organization group
 settings.

Fixes #32214.
---
 .../organization_permissions_admin.hbs        | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/web/templates/settings/organization_permissions_admin.hbs b/web/templates/settings/organization_permissions_admin.hbs
index 6da7fc12f1..8cc312528e 100644
--- a/web/templates/settings/organization_permissions_admin.hbs
+++ b/web/templates/settings/organization_permissions_admin.hbs
@@ -106,6 +106,24 @@
             </div>
         </div>
 
+        <div id="org-group-permissions" class="settings-subsection-parent">
+            <div class="subsection-header">
+                <h3>{{t "Group permissions" }}
+                    {{> ../help_link_widget link="/help/manage-user-groups" }}
+                </h3>
+                {{> settings_save_discard_widget section_name="group-permissions" }}
+            </div>
+            <div class="m-10 inline-block organization-permissions-parent">
+                {{> group_setting_value_pill_input
+                  setting_name="realm_can_manage_all_groups"
+                  label=(t 'Who can administer all user groups')}}
+
+                {{> group_setting_value_pill_input
+                  setting_name="realm_can_create_groups"
+                  label=(t 'Who can create user groups')}}
+            </div>
+        </div>
+
         <div id="org-direct-message-permissions" class="settings-subsection-parent">
             <div class="subsection-header">
                 <h3>{{t "Direct message permissions" }}
@@ -326,14 +344,6 @@
                     </select>
                 </div>
 
-                {{> group_setting_value_pill_input
-                  setting_name="realm_can_create_groups"
-                  label=(t 'Who can create user groups')}}
-
-                {{> group_setting_value_pill_input
-                  setting_name="realm_can_manage_all_groups"
-                  label=(t 'Who can administer all user groups')}}
-
                 {{> group_setting_value_pill_input
                   setting_name="realm_can_add_custom_emoji_group"
                   label=(t 'Who can add custom emoji')}}