mirror of
https://github.com/redmine/redmine.git
synced 2025-11-02 11:25:55 +01:00
Added 'email sending test' functionality.
Go to Admin -> Mail notifications and click on 'Send a test email'. If an error occurs while sending the mail, the error message is displayed to the user. git-svn-id: http://redmine.rubyforge.org/svn/trunk@632 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -56,6 +56,20 @@ class AdminController < ApplicationController
|
||||
end
|
||||
end
|
||||
|
||||
def test_email
|
||||
raise_delivery_errors = ActionMailer::Base.raise_delivery_errors
|
||||
# Force ActionMailer to raise delivery errors so we can catch it
|
||||
ActionMailer::Base.raise_delivery_errors = true
|
||||
begin
|
||||
@test = Mailer.deliver_test(logged_in_user)
|
||||
flash[:notice] = l(:notice_email_sent, logged_in_user.mail)
|
||||
rescue Exception => e
|
||||
flash[:error] = l(:notice_email_error, e.message)
|
||||
end
|
||||
ActionMailer::Base.raise_delivery_errors = raise_delivery_errors
|
||||
redirect_to :action => 'mail_options'
|
||||
end
|
||||
|
||||
def info
|
||||
@db_adapter_name = ActiveRecord::Base.connection.adapter_name
|
||||
@flags = Hash.new
|
||||
|
||||
Reference in New Issue
Block a user