Fixes active model dirty modification

Author: jtwohiou

Gemfile

@@ -26,8 +26,8 @@ group :development do
  gem 'rake'
  # gem 'debugger'
  gem 'quiet_assets'
- #gem 'better_errors'
- #gem 'binding_of_caller'
+ gem 'better_errors'
+ gem 'binding_of_caller'
 end
 group :test, :development do
  gem 'minitest', '~>5.3.3'

Gemfile.lock

@@ -70,6 +70,12 @@ GEM
  autoprefixer-rails (6.7.7)
  execjs
  bcrypt (3.1.11)
+ better_errors (2.1.1)
+ coderay (>= 1.0.0)
+ erubis (>= 2.6.6)
+ rack (>= 0.9.0)
+ binding_of_caller (0.7.2)
+ debug_inspector (>= 0.0.1)
  bluecloth (2.2.0)
  bootstrap-sass (3.3.7)
  autoprefixer-rails (>= 5.2.1)
@@ -89,6 +95,7 @@ GEM
  climate_control (0.1.0)
  cocaine (0.5.8)
  climate_control (>= 0.0.3, < 1.0)
+ coderay (1.1.0)
  compass (1.0.3)
  chunky_png (~> 1.2)
  compass-core (~> 1.0.2)
@@ -125,6 +132,7 @@ GEM
  cucumber-wire (0.0.1)
  daemons (1.1.9)
  database_cleaner (1.2.0)
+ debug_inspector (0.0.2)
  devise (3.5.10)
  bcrypt (~> 3.0)
  orm_adapter (~> 0.1)
@@ -287,6 +295,8 @@ PLATFORMS
 
 DEPENDENCIES
  aruba
+ better_errors
+ binding_of_caller
  bluecloth
  browsercms!
  capybara

lib/cms/behaviors/versioning.rb

@@ -37,7 +37,11 @@ def build_object_from_version()
 
  # Last but not least, clear the changed attributes
  if changed_attrs = obj.send(:changed_attributes)
- changed_attrs.clear
+ if self.class.private_instance_methods.include? :clear_attribute_changes
+ clear_attribute_changes changed_attrs
+ else
+ changed_attributes.clear
+ end
  end
 
  obj