From f775af43e07808e4c9c0512a7ddd52b38c1dea3f Mon Sep 17 00:00:00 2001 From: Hamza Tarar Date: Sat, 7 Nov 2026 01:24:36 +0500 Subject: [PATCH] fix: preserve dirty tracking when reordering siblings with numeric_order _ct_reorder_siblings called reload to pick up the sort order the reorder had just written. reload also clears @mutations_before_last_save, so every saved_change_to_* predicate returned false for a node that had moved, and after_update_commit callbacks guarded by them stopped firing. Read the order column back with pick instead, then clear_attribute_change so the assignment is not reported as a pending change. That touches only mutations_from_database, leaving the post-save dirty state intact, and costs the same single SELECT that reload did. Fixes #414. --- .../numeric_deterministic_ordering.rb | 7 ++++++- test/closure_tree/label_order_value_test.rb | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/lib/closure_tree/numeric_deterministic_ordering.rb b/lib/closure_tree/numeric_deterministic_ordering.rb index 6573769..4c1ec71 100644 --- a/lib/closure_tree/numeric_deterministic_ordering.rb +++ b/lib/closure_tree/numeric_deterministic_ordering.rb @@ -27,7 +27,12 @@ def _ct_reorder_prior_siblings_if_parent_changed def _ct_reorder_siblings(minimum_sort_order_value = nil) scope_conditions = _ct.scope_values_from_instance(self) _ct.reorder_with_parent_id(_ct_parent_id, minimum_sort_order_value, scope_conditions) - reload unless destroyed? + return if destroyed? + + # Only the order column can have been changed by the reorder, so read it back + # rather than reloading, which would discard the record's dirty tracking. + self.order_value = self.class.where(self.class.primary_key => _ct_id).pick(_ct.order_column_sym) + clear_attribute_change(_ct.order_column_sym) end def _ct_reorder_children(minimum_sort_order_value = nil) diff --git a/test/closure_tree/label_order_value_test.rb b/test/closure_tree/label_order_value_test.rb index 2496101..1795193 100644 --- a/test/closure_tree/label_order_value_test.rb +++ b/test/closure_tree/label_order_value_test.rb @@ -38,6 +38,24 @@ def setup assert_equal 1, c.reload.order_value end + test 'should keep dirty tracking when a node is moved to another location for Label' do + root = Label.create(name: 'root') + a = root.children.create(name: 'a') + b = root.children.create(name: 'b') + c = root.children.create(name: 'c') + + root2 = Label.create(name: 'root2') + b.update!(parent: root2, name: 'b2') + + assert b.saved_change_to_name? + assert_equal %w[b b2], b.saved_change_to_name + refute b.changed? + + assert_equal 0, b.order_value + assert_equal 0, a.reload.order_value + assert_equal 1, c.reload.order_value + end + test 'prepend_child should produce 0-based order values when reordering within the same parent' do root = Label.create(name: 'root') a = root.children.create(name: 'a')