mirror of
https://github.com/redmine/redmine.git
synced 2025-11-07 13:55:52 +01:00
Contributed by Dmitry Makurin. git-svn-id: https://svn.redmine.org/redmine/trunk@21725 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -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?
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user