Browse Source

Don't check that params[:settings] is a Hash.

git-svn-id: http://svn.redmine.org/redmine/trunk@15729 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/3.4.0
Jean-Philippe Lang 8 years ago
parent
commit
fcd8ace743
1 changed files with 5 additions and 4 deletions
  1. 5
    4
      app/controllers/settings_controller.rb

+ 5
- 4
app/controllers/settings_controller.rb View File

@@ -32,9 +32,10 @@ class SettingsController < ApplicationController

def edit
@notifiables = Redmine::Notifiable.all
if request.post? && params[:settings] && params[:settings].is_a?(Hash)
Setting.set_all_from_params(params[:settings])
flash[:notice] = l(:notice_successful_update)
if request.post?
if Setting.set_all_from_params(params[:settings])
flash[:notice] = l(:notice_successful_update)
end
redirect_to settings_path(:tab => params[:tab])
else
@options = {}
@@ -60,7 +61,7 @@ class SettingsController < ApplicationController
end

if request.post?
Setting.send "plugin_#{@plugin.id}=", params[:settings]
Setting.send "plugin_#{@plugin.id}=", params[:settings].permit!.to_h
flash[:notice] = l(:notice_successful_update)
redirect_to plugin_settings_path(@plugin)
else

Loading…
Cancel
Save