Skip to content

Fix email notification in my account when empty users mail notification value #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
nishidayuya wants to merge 2 commits into from
Closed

Fix email notification in my account when empty users mail notification value #21

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c4c25e
Tagged version 6.0.4.
marius-balteanu Mar 10, 2025
3b45582
feat(User#mail_notification): returns normalized value
nishidayuya Mar 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion app/models/user.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,17 @@ class User < Principal
end
end)

def mail_notification
notification = read_attribute(:mail_notification)
if MAIL_NOTIFICATION_OPTIONS.any? { |option_value, _label| option_value == notification }
notification
else
'none'
end
end

def set_mail_notification
self.mail_notification = Setting.default_notification_option if self.mail_notification.blank?
self.mail_notification = Setting.default_notification_option if self[:mail_notification].blank?
true
end

Expand Down
Loading