meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@16812 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2017-07-10 21:05:35 +00:00
parent 48259a1eda
commit 60e07b9bb3
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/settings_controller.rb
View File

@ -67,7 +67,8 @@ class SettingsController < ApplicationController
end end
if request.post? 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) flash[:notice] = l(:notice_successful_update)
redirect_to plugin_settings_path(@plugin) redirect_to plugin_settings_path(@plugin)
else else

14
test/functional/settings_controller_test.rb
View File

@ -242,6 +242,20 @@ class SettingsControllerTest < Redmine::ControllerTest
assert_equal({'sample_setting' => 'Value'}, Setting.plugin_foo) assert_equal({'sample_setting' => 'Value'}, Setting.plugin_foo)
end 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 def test_post_non_configurable_plugin_settings
Redmine::Plugin.register(:foo) {} Redmine::Plugin.register(:foo) {}