File tree Expand file tree Collapse file tree 1 file changed +11
-2
lines changed
Expand file tree Collapse file tree 1 file changed +11
-2
lines changed Original file line number Diff line number Diff line change 11# use db stored username, password, etc. for email
22
3+ def email_address_with_name ( address , name )
4+ # can switch to ActionMailer::Base.email_address_with_name() once we upgrade to Rails 6
5+ Mail ::Address . new . tap do |builder |
6+ builder . address = address
7+ builder . display_name = name . presence
8+ end . to_s
9+ end
10+
311if ActiveRecord ::Base . connection . table_exists? ( Setting . table_name )
4- ActionMailer ::Base . smtp_settings [ :user_name ] = Setting . find_by_key ( "system/mailer/email" ) &.value
12+ email_setting = Setting . find_by_key ( "system/mailer/email" )
13+ ActionMailer ::Base . smtp_settings [ :user_name ] = email_setting &.value
514 ActionMailer ::Base . smtp_settings [ :password ] = Setting . find_by_key ( "system/mailer/password" ) &.value
6- ActionMailer ::Base . default from : Setting . find_by_key ( "system/mailer/email" ) . value if Setting . find_by_key ( "system/mailer/email" ) &.value . present?
15+ ActionMailer ::Base . default from : email_address_with_name ( email_setting . value , "NZOI Training" ) if email_setting &.value . present?
716end
817
You can’t perform that action at this time.
0 commit comments