IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: automatically disable digests when enabling mailing list mode

Browse Source
This commit is contained in:
Régis Hanol 2016-11-28 15:52:35 +01:00
parent 671e230490
commit 6edd3c347c
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/services/user_updater.rb
View File

@ -70,7 +70,6 @@ class UserUpdater
TagUser.batch_set(user, level, attributes[attribute]) TagUser.batch_set(user, level, attributes[attribute])
end end
save_options = false save_options = false
OPTION_ATTR.each do |attribute| OPTION_ATTR.each do |attribute|
@ -86,6 +85,9 @@ class UserUpdater
end end
end end
# automatically disable digests when mailing_list_mode is enabled
user.user_option.email_digests = false if user.user_option.mailing_list_mode
fields = attributes[:custom_fields] fields = attributes[:custom_fields]
if fields.present? if fields.present?
user.custom_fields = user.custom_fields.merge(fields) user.custom_fields = user.custom_fields.merge(fields)

13
spec/services/user_updater_spec.rb
View File

@ -91,6 +91,19 @@ describe UserUpdater do
expect(user.date_of_birth).to eq(date_of_birth.to_date) expect(user.date_of_birth).to eq(date_of_birth.to_date)
end end
it "disables email_digests when enabling mailing_list_mode" do
user = Fabricate(:user)
updater = UserUpdater.new(acting_user, user)
val = updater.update(mailing_list_mode: true, email_digests: true)
expect(val).to be_truthy
user.reload
expect(user.user_option.email_digests).to eq false
expect(user.user_option.mailing_list_mode).to eq true
end
context 'when sso overrides bio' do context 'when sso overrides bio' do
it 'does not change bio' do it 'does not change bio' do
SiteSetting.enable_sso = true SiteSetting.enable_sso = true