mirror of
https://github.com/redmine/redmine.git
synced 2024-08-27 17:54:48 +02:00
Merged r12126 from trunk (#13008).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12127 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
e7c82e3934
commit
ddc016d81d
@ -33,7 +33,7 @@ class UserPreference < ActiveRecord::Base
|
||||
end
|
||||
|
||||
def [](attr_name)
|
||||
if attribute_present? attr_name
|
||||
if has_attribute? attr_name
|
||||
super
|
||||
else
|
||||
others ? others[attr_name] : nil
|
||||
@ -41,7 +41,7 @@ class UserPreference < ActiveRecord::Base
|
||||
end
|
||||
|
||||
def []=(attr_name, value)
|
||||
if attribute_present? attr_name
|
||||
if has_attribute? attr_name
|
||||
super
|
||||
else
|
||||
h = (read_attribute(:others) || {}).dup
|
||||
|
@ -55,6 +55,11 @@ class UserPreferenceTest < ActiveSupport::TestCase
|
||||
assert_kind_of Hash, up.others
|
||||
end
|
||||
|
||||
def test_others_should_be_blank_after_initialization
|
||||
pref = User.new.pref
|
||||
assert_equal({}, pref.others)
|
||||
end
|
||||
|
||||
def test_reading_value_from_nil_others_hash
|
||||
up = UserPreference.new(:user => User.new)
|
||||
up.others = nil
|
||||
|
Loading…
Reference in New Issue
Block a user