Mercurial > hg > soundsoftware-site
comparison app/controllers/admin_controller.rb @ 1516:b450a9d58aed redmine-2.4
Update to Redmine SVN revision 13356 on 2.4-stable branch
| author | Chris Cannam |
|---|---|
| date | Tue, 09 Sep 2014 09:28:31 +0100 |
| parents | e248c7af89ec |
| children |
comparison
equal
deleted
inserted
replaced
| 1494:e248c7af89ec | 1516:b450a9d58aed |
|---|---|
| 63 ActionMailer::Base.raise_delivery_errors = true | 63 ActionMailer::Base.raise_delivery_errors = true |
| 64 begin | 64 begin |
| 65 @test = Mailer.test_email(User.current).deliver | 65 @test = Mailer.test_email(User.current).deliver |
| 66 flash[:notice] = l(:notice_email_sent, User.current.mail) | 66 flash[:notice] = l(:notice_email_sent, User.current.mail) |
| 67 rescue Exception => e | 67 rescue Exception => e |
| 68 flash[:error] = l(:notice_email_error, Redmine::CodesetUtil.replace_invalid_utf8(e.message)) | 68 flash[:error] = l(:notice_email_error, Redmine::CodesetUtil.replace_invalid_utf8(e.message.dup)) |
| 69 end | 69 end |
| 70 ActionMailer::Base.raise_delivery_errors = raise_delivery_errors | 70 ActionMailer::Base.raise_delivery_errors = raise_delivery_errors |
| 71 redirect_to settings_path(:tab => 'notifications') | 71 redirect_to settings_path(:tab => 'notifications') |
| 72 end | 72 end |
| 73 | 73 |
