kotovalexarian-likes-github
/
paper-trail-gem--paper_trail
mirror of https://github.com/paper-trail-gem/paper_trail.git
1
0
Fork 0
Code Releases Activity

Association tracking should only occur if the columns and tables necessary have been created

This commit is contained in:
Ben Atkins 2014-12-31 13:32:16 -05:00
parent 5e47174e13
commit 899c15b24d
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/paper_trail/has_paper_trail.rb
View File

@ -281,8 +281,7 @@ module PaperTrail
if paper_trail_switched_on?
data = {
:event => paper_trail_event || 'create',
:whodunnit => PaperTrail.whodunnit,
:transaction_id => PaperTrail.transaction_id
:whodunnit => PaperTrail.whodunnit
}
if respond_to?(:created_at)
data[PaperTrail.timestamp_field] = created_at
@ -291,6 +290,9 @@ module PaperTrail
data[:object_changes] = self.class.paper_trail_version_class.object_changes_col_is_json? ? changes_for_paper_trail :
PaperTrail.serializer.dump(changes_for_paper_trail)
end
if self.class.paper_trail_version_class.column_names.include?('transaction_id')
data[:transaction_id] = PaperTrail.transaction_id
end
version = send(self.class.versions_association_name).create! merge_metadata(data)
set_transaction_id(version)
save_associations(version)
@ -303,8 +305,7 @@ module PaperTrail
data = {
:event => paper_trail_event || 'update',
:object => self.class.paper_trail_version_class.object_col_is_json? ? object_attrs : PaperTrail.serializer.dump(object_attrs),
:whodunnit => PaperTrail.whodunnit,
:transaction_id => PaperTrail.transaction_id
:whodunnit => PaperTrail.whodunnit
}
if respond_to?(:updated_at)
data[PaperTrail.timestamp_field] = updated_at
@ -313,6 +314,9 @@ module PaperTrail
data[:object_changes] = self.class.paper_trail_version_class.object_changes_col_is_json? ? changes_for_paper_trail :
PaperTrail.serializer.dump(changes_for_paper_trail)
end
if self.class.paper_trail_version_class.column_names.include?('transaction_id')
data[:transaction_id] = PaperTrail.transaction_id
end
version = send(self.class.versions_association_name).create merge_metadata(data)
set_transaction_id(version)
save_associations(version)
@ -352,9 +356,11 @@ module PaperTrail
:item_type => self.class.base_class.name,
:event => paper_trail_event || 'destroy',
:object => self.class.paper_trail_version_class.object_col_is_json? ? object_attrs : PaperTrail.serializer.dump(object_attrs),
:whodunnit => PaperTrail.whodunnit,
:transaction_id => PaperTrail.transaction_id
:whodunnit => PaperTrail.whodunnit
}
if self.class.paper_trail_version_class.column_names.include?('transaction_id')
data[:transaction_id] = PaperTrail.transaction_id
end
version = self.class.paper_trail_version_class.create(merge_metadata(data))
send("#{self.class.version_association_name}=", version)
send(self.class.versions_association_name).send :load_target
@ -363,7 +369,9 @@ module PaperTrail
end
end
# saves associations if the join table for `VersionAssociation` exists
def save_associations(version)
return unless PaperTrail::VersionAssociation.table_exists?
self.class.reflect_on_all_associations(:belongs_to).each do |assoc|
if assoc.klass.paper_trail_enabled_for_model?
PaperTrail::VersionAssociation.create(
@ -376,6 +384,7 @@ module PaperTrail
end
def set_transaction_id(version)
return unless self.class.paper_trail_version_class.column_names.include?('transaction_id')
if PaperTrail.transaction? && PaperTrail.transaction_id.nil?
PaperTrail.transaction_id = version.id
version.transaction_id = version.id

1
test/dummy/db/migrate/20110208155312_set_up_test_tables.rb
View File

@ -52,7 +52,6 @@ class SetUpTestTables < ActiveRecord::Migration
t.string :event, :null => false
t.string :whodunnit
t.text :object
t.integer :transaction_id
t.datetime :created_at
# Controller info columns.