Rename private method to: update_transaction_id
This is not a breaking change, because this method is not part of PT's public API. The word update hints at the fact that the version model is being saved, so it is a better name, but the main purpose is to conform to the ruby style guide, which recommends against methods like "set_x" preferring instead "x="
This commit is contained in:
parent
36b4032c09
commit
b4ee9ea34e
|
@ -322,7 +322,7 @@ module PaperTrail
|
||||||
data[:transaction_id] = PaperTrail.transaction_id
|
data[:transaction_id] = PaperTrail.transaction_id
|
||||||
end
|
end
|
||||||
version = send(self.class.versions_association_name).create! merge_metadata(data)
|
version = send(self.class.versions_association_name).create! merge_metadata(data)
|
||||||
set_transaction_id(version)
|
update_transaction_id(version)
|
||||||
save_associations(version)
|
save_associations(version)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -344,7 +344,7 @@ module PaperTrail
|
||||||
data[:transaction_id] = PaperTrail.transaction_id
|
data[:transaction_id] = PaperTrail.transaction_id
|
||||||
end
|
end
|
||||||
version = send(self.class.versions_association_name).create merge_metadata(data)
|
version = send(self.class.versions_association_name).create merge_metadata(data)
|
||||||
set_transaction_id(version)
|
update_transaction_id(version)
|
||||||
save_associations(version)
|
save_associations(version)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -427,7 +427,7 @@ module PaperTrail
|
||||||
version = self.class.paper_trail_version_class.create(merge_metadata(data))
|
version = self.class.paper_trail_version_class.create(merge_metadata(data))
|
||||||
send("#{self.class.version_association_name}=", version)
|
send("#{self.class.version_association_name}=", version)
|
||||||
send(self.class.versions_association_name).send :load_target
|
send(self.class.versions_association_name).send :load_target
|
||||||
set_transaction_id(version)
|
update_transaction_id(version)
|
||||||
save_associations(version)
|
save_associations(version)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -456,15 +456,6 @@ module PaperTrail
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def set_transaction_id(version) # rubocop:disable Style/AccessorMethodName
|
|
||||||
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
|
|
||||||
version.save
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def reset_transaction_id
|
def reset_transaction_id
|
||||||
PaperTrail.transaction_id = nil
|
PaperTrail.transaction_id = nil
|
||||||
end
|
end
|
||||||
|
@ -563,6 +554,16 @@ module PaperTrail
|
||||||
unless_condition = paper_trail_options[:unless]
|
unless_condition = paper_trail_options[:unless]
|
||||||
(if_condition.blank? || if_condition.call(self)) && !unless_condition.try(:call, self)
|
(if_condition.blank? || if_condition.call(self)) && !unless_condition.try(:call, self)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# @api private
|
||||||
|
def update_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
|
||||||
|
version.save
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue