From 42783392c8b3d3383424f8b795d508034b9a7cd1 Mon Sep 17 00:00:00 2001 From: Ben Atkins Date: Mon, 24 Nov 2014 11:34:19 -0500 Subject: [PATCH] Code cleanup on PaperTrail::Model::InstanceMethods --- lib/paper_trail/has_paper_trail.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/paper_trail/has_paper_trail.rb b/lib/paper_trail/has_paper_trail.rb index 11ad7b04..a40c9968 100644 --- a/lib/paper_trail/has_paper_trail.rb +++ b/lib/paper_trail/has_paper_trail.rb @@ -355,7 +355,9 @@ module PaperTrail previous = self.dup # `dup` clears timestamps so we add them back. all_timestamp_attributes.each do |column| - previous[column] = send(column) if self.class.column_names.include?(column.to_s) and not send(column).nil? + if self.class.column_names.include?(column.to_s) and not send("#{column}_was").nil? + previous[column] = send("#{column}_was") + end end enums = previous.respond_to?(:defined_enums) ? previous.defined_enums : {} previous.tap do |prev| @@ -369,7 +371,7 @@ module PaperTrail # returns hash of object attributes (with appropriate attributes serialized), ommitting attributes to be skipped def object_attrs_for_paper_trail(object) - _attrs = object.attributes.except(*self.paper_trail_options[:skip]).tap do |attributes| + object.attributes.except(*self.paper_trail_options[:skip]).tap do |attributes| self.class.serialize_attributes_for_paper_trail(attributes) end end