A platform for community discussion. Free, open, simple.
FIX: Prevent moderator group owners from clearing email domains (#39651)
Natalie Tayf168d765064b
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rbindex 79456108a0a..95314b61aaf 100644--- a/app/controllers/groups_controller.rb+++ b/app/controllers/groups_controller.rb@@ -156,7 +156,7 @@ class GroupsController < ApplicationControllergroup = Group.find(params[:id])guardian.ensure_can_edit!(group) if !guardian.can_admin_group?(group)- group_attributes = group_params(automatic: group.automatic)+ group_attributes = group_params(automatic: group.automatic, group:)reset_group_email_settings_if_disabled!(group, group_attributes)categories, tags = []@@ -796,7 +796,7 @@ class GroupsController < ApplicationControllerendend- def group_params(automatic: false)+ def group_params(automatic: false, group: nil)attributes = %i[bio_rawdefault_notification_level@@ -836,7 +836,6 @@ class GroupsController < ApplicationController:primary_group,:name,:grant_trust_level,- :automatic_membership_email_domains,:publish_read_state,:allow_unknown_sender_topic_replies,)@@ -845,6 +844,10 @@ class GroupsController < ApplicationControllerattributes << { custom_fields: custom_fields } if custom_fields.present?end+ if !automatic && group && guardian.can_admin_group?(group)+ attributes.push(:automatic_membership_email_domains)+ end+if !automatic || current_user.admin%i[muted regular tracking watching watching_first_post].each do |level|attributes << { "#{level}_category_ids" => [] }diff --git a/spec/requests/groups_controller_spec.rb b/spec/requests/groups_controller_spec.rbindex 206e6e10dad..283aad43a06 100644--- a/spec/requests/groups_controller_spec.rb+++ b/spec/requests/groups_controller_spec.rb@@ -1121,6 +1121,26 @@ RSpec.describe GroupsController doexpect(group.flair_bg_color).to eq("FFF")end+ it "should not clear automatic_membership_email_domains when moderator owner updates group" do+ SiteSetting.moderators_manage_groups = false+ user.update!(moderator: true)+ group.update!(automatic_membership_email_domains: "test.org")++ put "/groups/#{group.id}.json",+ params: {+ group: {+ bio_raw: "updated bio",+ automatic_membership_email_domains: "",+ },+ }++ expect(response.status).to eq(200)++ group.reload+ expect(group.automatic_membership_email_domains).to eq("test.org")+ expect(group.bio_raw).to eq("updated bio")+ end+it "should not be allowed to update automatic groups" dogroup = Group.find(Group::AUTO_GROUPS[:admins])