diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-12-02 13:52:16 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2007-12-02 13:52:16 +0000 |
| commit | bc060b31ae086db5a6baf6e3a892c525b2b6f0cd (patch) | |
| tree | d416375902ae23c70055d2fcc6c6c75e5282249a /app/controllers/admin_controller.rb | |
| parent | aebcfb1eda843b90851e0facdc0a386bf06c5d29 (diff) | |
| download | redmine-bc060b31ae086db5a6baf6e3a892c525b2b6f0cd.tar.gz redmine-bc060b31ae086db5a6baf6e3a892c525b2b6f0cd.zip | |
Email notifications are now sent as Blind carbon copy by default. This can be changed in email notifications settings (new setting added).
Emission email address setting moved to the email notifications settings view.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@944 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/admin_controller.rb')
| -rw-r--r-- | app/controllers/admin_controller.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index b448affcc..58d6115ee 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -48,8 +48,9 @@ class AdminController < ApplicationController def mail_options @notifiables = %w(issue_added issue_updated news_added document_added file_added message_posted) if request.post? - Setting.notified_events = (params[:notified_events] || []) - Setting.emails_footer = params[:emails_footer] if params[:emails_footer] + settings = (params[:settings] || {}).dup + settings[:notified_events] ||= [] + settings.each { |name, value| Setting[name] = value } flash[:notice] = l(:notice_successful_update) redirect_to :controller => 'admin', :action => 'mail_options' end |