Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: set mailing_list_mode to false when unsubscribing from all (#10354) 

Currently, we only reset `email_digests`, `email_level` and `email_messages_level` when the user wants to unsubscribe from all email.

`mailing_list_mode` should be reset as well
This commit is contained in:
Krzysztof Kotlarek 2020-08-03 16:59:54 +10:00 committed by GitHub
parent 3f054d3350
commit 515699776b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/email_controller.rb
View File

@ -100,7 +100,8 @@ class EmailController < ApplicationController
if params["unsubscribe_all"] if params["unsubscribe_all"]
user.user_option.update_columns(email_digests: false, user.user_option.update_columns(email_digests: false,
email_level: UserOption.email_level_types[:never], email_level: UserOption.email_level_types[:never],
email_messages_level: UserOption.email_level_types[:never]) email_messages_level: UserOption.email_level_types[:never],
mailing_list_mode: false)
updated = true updated = true
end end

4
spec/requests/email_controller_spec.rb
View File

@ -19,7 +19,8 @@ RSpec.describe EmailController do
it 'can fully unsubscribe' do it 'can fully unsubscribe' do
user.user_option.update_columns(email_digests: true, user.user_option.update_columns(email_digests: true,
email_level: UserOption.email_level_types[:never], email_level: UserOption.email_level_types[:never],
email_messages_level: UserOption.email_level_types[:never]) email_messages_level: UserOption.email_level_types[:never],
mailing_list_mode: true)
post "/email/unsubscribe/#{key}.json", post "/email/unsubscribe/#{key}.json",
params: { unsubscribe_all: "1" } params: { unsubscribe_all: "1" }
@ -36,6 +37,7 @@ RSpec.describe EmailController do
expect(user.user_option.email_digests).to eq(false) expect(user.user_option.email_digests).to eq(false)
expect(user.user_option.email_level).to eq(UserOption.email_level_types[:never]) expect(user.user_option.email_level).to eq(UserOption.email_level_types[:never])
expect(user.user_option.email_messages_level).to eq(UserOption.email_level_types[:never]) expect(user.user_option.email_messages_level).to eq(UserOption.email_level_types[:never])
expect(user.user_option.mailing_list_mode).to eq(false)
end end
it 'can disable mailing list' do it 'can disable mailing list' do