diff --git a/app/models/budget/investment.rb b/app/models/budget/investment.rb index d685b8507..347eeef2d 100644 --- a/app/models/budget/investment.rb +++ b/app/models/budget/investment.rb @@ -396,7 +396,7 @@ class Budget private def set_denormalized_ids - self.group_id = heading&.group_id if heading_id_changed? + self.group_id = heading&.group_id if will_save_change_to_heading_id? self.budget_id ||= heading&.group&.budget_id end diff --git a/app/models/poll/partial_result.rb b/app/models/poll/partial_result.rb index 134cf377d..d8e9cc18b 100644 --- a/app/models/poll/partial_result.rb +++ b/app/models/poll/partial_result.rb @@ -19,10 +19,10 @@ class Poll::PartialResult < ApplicationRecord before_save :update_logs def update_logs - if amount_changed? && amount_was.present? - self.amount_log += ":#{amount_was}" - self.officer_assignment_id_log += ":#{officer_assignment_id_was}" - self.author_id_log += ":#{author_id_was}" + if will_save_change_to_amount? && amount_in_database.present? + self.amount_log += ":#{amount_in_database}" + self.officer_assignment_id_log += ":#{officer_assignment_id_in_database}" + self.author_id_log += ":#{author_id_in_database}" end end end diff --git a/app/models/poll/recount.rb b/app/models/poll/recount.rb index 9895d99e8..b5fb52bbf 100644 --- a/app/models/poll/recount.rb +++ b/app/models/poll/recount.rb @@ -20,9 +20,9 @@ class Poll::Recount < ApplicationRecord amounts_changed = false [:white, :null, :total].each do |amount| - next unless send("#{amount}_amount_changed?") && send("#{amount}_amount_was").present? + next unless send("will_save_change_to_#{amount}_amount?") && send("#{amount}_amount_in_database").present? - self["#{amount}_amount_log"] += ":#{send("#{amount}_amount_was")}" + self["#{amount}_amount_log"] += ":#{send("#{amount}_amount_in_database")}" amounts_changed = true end @@ -30,7 +30,7 @@ class Poll::Recount < ApplicationRecord end def update_officer_author - self.officer_assignment_id_log += ":#{officer_assignment_id_was}" - self.author_id_log += ":#{author_id_was}" + self.officer_assignment_id_log += ":#{officer_assignment_id_in_database}" + self.author_id_log += ":#{author_id_in_database}" end end