##// END OF EJS Templates
Don't check that params[:settings] is a Hash....
Jean-Philippe Lang -
r15347:fcd8ace743b8
parent child
Show More
@@ -1,73 +1,74
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2016 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 class SettingsController < ApplicationController
19 19 layout 'admin'
20 20 menu_item :plugins, :only => :plugin
21 21
22 22 helper :queries
23 23
24 24 before_action :require_admin
25 25
26 26 require_sudo_mode :index, :edit, :plugin
27 27
28 28 def index
29 29 edit
30 30 render :action => 'edit'
31 31 end
32 32
33 33 def edit
34 34 @notifiables = Redmine::Notifiable.all
35 if request.post? && params[:settings] && params[:settings].is_a?(Hash)
36 Setting.set_all_from_params(params[:settings])
35 if request.post?
36 if Setting.set_all_from_params(params[:settings])
37 37 flash[:notice] = l(:notice_successful_update)
38 end
38 39 redirect_to settings_path(:tab => params[:tab])
39 40 else
40 41 @options = {}
41 42 user_format = User::USER_FORMATS.collect{|key, value| [key, value[:setting_order]]}.sort{|a, b| a[1] <=> b[1]}
42 43 @options[:user_format] = user_format.collect{|f| [User.current.name(f[0]), f[0].to_s]}
43 44 @deliveries = ActionMailer::Base.perform_deliveries
44 45
45 46 @guessed_host_and_path = request.host_with_port.dup
46 47 @guessed_host_and_path << ('/'+ Redmine::Utils.relative_url_root.gsub(%r{^\/}, '')) unless Redmine::Utils.relative_url_root.blank?
47 48
48 49 @commit_update_keywords = Setting.commit_update_keywords.dup
49 50 @commit_update_keywords = [{}] unless @commit_update_keywords.is_a?(Array) && @commit_update_keywords.any?
50 51
51 52 Redmine::Themes.rescan
52 53 end
53 54 end
54 55
55 56 def plugin
56 57 @plugin = Redmine::Plugin.find(params[:id])
57 58 unless @plugin.configurable?
58 59 render_404
59 60 return
60 61 end
61 62
62 63 if request.post?
63 Setting.send "plugin_#{@plugin.id}=", params[:settings]
64 Setting.send "plugin_#{@plugin.id}=", params[:settings].permit!.to_h
64 65 flash[:notice] = l(:notice_successful_update)
65 66 redirect_to plugin_settings_path(@plugin)
66 67 else
67 68 @partial = @plugin.settings[:partial]
68 69 @settings = Setting.send "plugin_#{@plugin.id}"
69 70 end
70 71 rescue Redmine::PluginNotFound
71 72 render_404
72 73 end
73 74 end
General Comments 0
You need to be logged in to leave comments. Login now