diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-01-21 20:37:45 -0200 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2014-01-21 20:37:45 -0200 |
commit | 9383de42a2cf23cc53052cec2f736864c1c562a1 (patch) | |
tree | 19ddfa20500d526311bb48f4a8ae5abffe046963 /activerecord/lib/active_record/attribute_methods | |
parent | c6ecfc1668d6e2c69d360ed376b9e3f77ad72e83 (diff) | |
parent | 55f6c8c908fea2609cbc8503f8d87460fd1b16b4 (diff) | |
download | rails-9383de42a2cf23cc53052cec2f736864c1c562a1.tar.gz rails-9383de42a2cf23cc53052cec2f736864c1c562a1.tar.bz2 rails-9383de42a2cf23cc53052cec2f736864c1c562a1.zip |
Merge pull request #13776 from rails/dirty-enum
Implement the Dirty API with the Enum feature correctly.
Conflicts:
activerecord/CHANGELOG.md
Diffstat (limited to 'activerecord/lib/active_record/attribute_methods')
-rw-r--r-- | activerecord/lib/active_record/attribute_methods/dirty.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/attribute_methods/dirty.rb b/activerecord/lib/active_record/attribute_methods/dirty.rb index 19e81abba5..68168bb729 100644 --- a/activerecord/lib/active_record/attribute_methods/dirty.rb +++ b/activerecord/lib/active_record/attribute_methods/dirty.rb @@ -43,6 +43,12 @@ module ActiveRecord def write_attribute(attr, value) attr = attr.to_s + save_changed_attribute(attr, value) + + super(attr, value) + end + + def save_changed_attribute(attr, value) # The attribute already has an unsaved change. if attribute_changed?(attr) old = changed_attributes[attr] @@ -51,9 +57,6 @@ module ActiveRecord old = clone_attribute_value(:read_attribute, attr) changed_attributes[attr] = old if _field_changed?(attr, old, value) end - - # Carry on. - super(attr, value) end def update_record(*) |