meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-11 03:33:07 +00:00
Code Issues Releases Wiki Activity

Merged r21725 from trunk to 5.0-stable (#37450, #37476).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@21729 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2022-07-21 01:41:14 +00:00
parent c68090dae7
commit 5740256ed9
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/setting.rb
View File

@ -108,7 +108,7 @@ class Setting < ActiveRecord::Base
v = read_attribute(:value)
# Unserialize serialized settings
if available_settings[name]['serialized'] && v.is_a?(String)
v = YAML.safe_load(v, permitted_classes: [ActiveSupport::HashWithIndifferentAccess])
v = YAML.safe_load(v, permitted_classes: [Symbol, ActiveSupport::HashWithIndifferentAccess])
v = force_utf8_strings(v)
end
v = v.to_sym if available_settings[name]['format'] == 'symbol' && !v.blank?

7
test/unit/lib/redmine/plugin_test.rb
View File

@ -196,6 +196,13 @@ class Redmine::PluginTest < ActiveSupport::TestCase
end
end
def test_default_settings
@klass.register(:foo_plugin) {settings :default => {'key1' => 'abc', :key2 => 123}}
h = Setting.plugin_foo_plugin
assert_equal 'abc', h['key1']
assert_equal 123, h[:key2]
end
def test_settings_warns_about_possible_partial_collision
@klass.register(:foo_plugin) {settings :partial => 'foo/settings'}
Rails.logger.expects(:warn)