ソースを参照

Don't error when posting empty plugin settings (#26393).

git-svn-id: http://svn.redmine.org/redmine/trunk@16812 e93f8b46-1217-0410-a6f0-8f06a7374b81
tags/4.0.0
Jean-Philippe Lang 7年前
コミット
60e07b9bb3
2個のファイルの変更16行の追加1行の削除
  1. 2
    1
      app/controllers/settings_controller.rb
  2. 14
    0
      test/functional/settings_controller_test.rb

+ 2
- 1
app/controllers/settings_controller.rb ファイルの表示

@@ -67,7 +67,8 @@ class SettingsController < ApplicationController
end

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

+ 14
- 0
test/functional/settings_controller_test.rb ファイルの表示

@@ -242,6 +242,20 @@ class SettingsControllerTest < Redmine::ControllerTest
assert_equal({'sample_setting' => 'Value'}, Setting.plugin_foo)
end

def test_post_empty_plugin_settings
Redmine::Plugin.register(:foo) do
settings :partial => 'not blank', # so that configurable? is true
:default => {'sample_setting' => 'Plugin setting value'}
end

post :plugin, :params => {
:id => 'foo'
}
assert_redirected_to '/settings/plugin/foo'

assert_equal({}, Setting.plugin_foo)
end

def test_post_non_configurable_plugin_settings
Redmine::Plugin.register(:foo) {}


読み込み中…
キャンセル
保存