[MM-62609] Show Group Mentions permissions if custom groups is enabled (

mattermost#30319)
ctlaltdieliet · Feb 27, 2025 · aa1f50c · aa1f50c
1 parent ac10bb1
commit aa1f50c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/...omponents/admin_console/permission_schemes_settings/permissions_tree/permissions_tree.tsx b/...omponents/admin_console/permission_schemes_settings/permissions_tree/permissions_tree.tsx
@@ -240,7 +240,7 @@ export default class PermissionsTree extends React.PureComponent<Props, State> {
         if (scope === 'team_scope' && this.groups[0].id !== 'teams_team_scope') {
             this.groups[0].id = 'teams_team_scope';
         }
-        if (license?.IsLicensed === 'true' && license?.LDAPGroups === 'true' && !postsGroup.permissions.includes(Permissions.USE_GROUP_MENTIONS)) {
+        if (license?.IsLicensed === 'true' && (license?.LDAPGroups === 'true' || config.EnableCustomGroups === 'true') && !postsGroup.permissions.includes(Permissions.USE_GROUP_MENTIONS)) {
             postsGroup.permissions.push(Permissions.USE_GROUP_MENTIONS);
         }
         postsGroup.permissions.push({