##// END OF EJS Templates
prevent "can't modify frozen String" exception when mail sending error (#17235)...
Toshi MARUYAMA -
r12923:cb7b57815e3a
parent child
Show More
@@ -1,84 +1,84
1 # Redmine - project management software
1 # Redmine - project management software
2 # Copyright (C) 2006-2014 Jean-Philippe Lang
2 # Copyright (C) 2006-2014 Jean-Philippe Lang
3 #
3 #
4 # This program is free software; you can redistribute it and/or
4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License
5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2
6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version.
7 # of the License, or (at your option) any later version.
8 #
8 #
9 # This program is distributed in the hope that it will be useful,
9 # This program is distributed in the hope that it will be useful,
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 # GNU General Public License for more details.
12 # GNU General Public License for more details.
13 #
13 #
14 # You should have received a copy of the GNU General Public License
14 # You should have received a copy of the GNU General Public License
15 # along with this program; if not, write to the Free Software
15 # along with this program; if not, write to the Free Software
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17
17
18 class AdminController < ApplicationController
18 class AdminController < ApplicationController
19 layout 'admin'
19 layout 'admin'
20 menu_item :projects, :only => :projects
20 menu_item :projects, :only => :projects
21 menu_item :plugins, :only => :plugins
21 menu_item :plugins, :only => :plugins
22 menu_item :info, :only => :info
22 menu_item :info, :only => :info
23
23
24 before_filter :require_admin
24 before_filter :require_admin
25 helper :sort
25 helper :sort
26 include SortHelper
26 include SortHelper
27
27
28 def index
28 def index
29 @no_configuration_data = Redmine::DefaultData::Loader::no_data?
29 @no_configuration_data = Redmine::DefaultData::Loader::no_data?
30 end
30 end
31
31
32 def projects
32 def projects
33 @status = params[:status] || 1
33 @status = params[:status] || 1
34
34
35 scope = Project.status(@status).order('lft')
35 scope = Project.status(@status).order('lft')
36 scope = scope.like(params[:name]) if params[:name].present?
36 scope = scope.like(params[:name]) if params[:name].present?
37 @projects = scope.all
37 @projects = scope.all
38
38
39 render :action => "projects", :layout => false if request.xhr?
39 render :action => "projects", :layout => false if request.xhr?
40 end
40 end
41
41
42 def plugins
42 def plugins
43 @plugins = Redmine::Plugin.all
43 @plugins = Redmine::Plugin.all
44 end
44 end
45
45
46 # Loads the default configuration
46 # Loads the default configuration
47 # (roles, trackers, statuses, workflow, enumerations)
47 # (roles, trackers, statuses, workflow, enumerations)
48 def default_configuration
48 def default_configuration
49 if request.post?
49 if request.post?
50 begin
50 begin
51 Redmine::DefaultData::Loader::load(params[:lang])
51 Redmine::DefaultData::Loader::load(params[:lang])
52 flash[:notice] = l(:notice_default_data_loaded)
52 flash[:notice] = l(:notice_default_data_loaded)
53 rescue Exception => e
53 rescue Exception => e
54 flash[:error] = l(:error_can_t_load_default_data, e.message)
54 flash[:error] = l(:error_can_t_load_default_data, e.message)
55 end
55 end
56 end
56 end
57 redirect_to admin_path
57 redirect_to admin_path
58 end
58 end
59
59
60 def test_email
60 def test_email
61 raise_delivery_errors = ActionMailer::Base.raise_delivery_errors
61 raise_delivery_errors = ActionMailer::Base.raise_delivery_errors
62 # Force ActionMailer to raise delivery errors so we can catch it
62 # Force ActionMailer to raise delivery errors so we can catch it
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
74 def info
74 def info
75 @db_adapter_name = ActiveRecord::Base.connection.adapter_name
75 @db_adapter_name = ActiveRecord::Base.connection.adapter_name
76 @checklist = [
76 @checklist = [
77 [:text_default_administrator_account_changed, User.default_admin_account_changed?],
77 [:text_default_administrator_account_changed, User.default_admin_account_changed?],
78 [:text_file_repository_writable, File.writable?(Attachment.storage_path)],
78 [:text_file_repository_writable, File.writable?(Attachment.storage_path)],
79 [:text_plugin_assets_writable, File.writable?(Redmine::Plugin.public_directory)],
79 [:text_plugin_assets_writable, File.writable?(Redmine::Plugin.public_directory)],
80 [:text_rmagick_available, Object.const_defined?(:Magick)],
80 [:text_rmagick_available, Object.const_defined?(:Magick)],
81 [:text_convert_available, Redmine::Thumbnail.convert_available?]
81 [:text_convert_available, Redmine::Thumbnail.convert_available?]
82 ]
82 ]
83 end
83 end
84 end
84 end
General Comments 0
You need to be logged in to leave comments. Login now