active_scaffold_sortable 3.2.4 → 3.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 666d92caced88e95e8c98bf4ed2cd815d31425b5
-  data.tar.gz: a4e865644f6d648ad1efb607aa01ac6b826b0473
+  data.tar.gz: 29f2059c445752f852c6589e5477bf02b5198f00
+  metadata.gz: e78ba9e92f9bcf097b6b478e0876121e9d62947c
 SHA512: 
-  metadata.gz: 03c17a7e0d497d11633ea691723d0d6436e44046ae1d0a6909ebbf58e9ac9bb882bec6f2d4444b35fc4f992425ab7bf7357f7ddd16ef5e951a231652bf66ad54
-  data.tar.gz: 0167d621ad24ef17534739a6f2ffe94ffddd79554903757eea345b58dcb195fffc3ead9be29a82adf2e0371ae60b1af986324a506cfe949164668b16e23673ab
+  data.tar.gz: 2366be6e69888f911a3c59b882a4df4de26ba5509e8271e3d2702d55de7969976bd8809d3e3b3f08ddcd61f90f4ea825a908457fe713b9a32bc8425676bfbcbe
+  metadata.gz: bf80be7ee099ae651ad39fa51b3260a03220d08cbab61b3508e93a326fe69df6f88e3bd54d7c0bbae238bfab91d6ca439b0405596941aeed4160c8a691b158b4

data/lib/active_scaffold/actions/sortable.rb

@@ -59,20 +59,22 @@ module ActiveScaffold::Actions
     end
     
     def reorder_children_in_tree(model)
-      current_order = model.find(params[active_scaffold_tbody_id].first).try(:self_and_siblings)
+      full_order = model.find(params[active_scaffold_tbody_id].first).try(:self_and_siblings)
       new_order = params[active_scaffold_tbody_id].collect {|item_id| item_id.to_i}
+      current_order = full_order.length == new_order.length ? full_order : full_order.select{ |r| new_order.include? r.id }
+
       new_order.each_with_index do |record_id, new_position|
-        if record_id != current_order[new_position].id
-          current_order = move_child(current_order.find {|child| child.id == record_id}, new_position, current_order) 
+        child = full_order.find {|child| child.id == record_id}
+        while record_id != current_order[new_position].id do
+          full_order = move_child(child, current_order.index(child), new_position)
+          current_order = full_order.length == new_order.length ? full_order : full_order.select{ |r| new_order.include? r.id }
         end
       end if new_order.length == current_order.length
     end
-    
-    def move_child(child, new_position, children)
-      old_position = children.index(child)
-      (old_position - new_position).abs.times do |step|
-        child.send((old_position - new_position) > 0 ? :move_left : :move_right)
-      end
+
+    def move_child(child, old_position, new_position)
+      method = (old_position - new_position) > 0 ? :move_left : :move_right
+      (old_position - new_position).abs.times { |_| child.send(method) }
       child.self_and_siblings
     end
 

data/lib/active_scaffold_sortable/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffoldSortable
   module Version
     MAJOR = 3
     MINOR = 2
-    PATCH = 4
+    PATCH = 5
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: active_scaffold_sortable
 version: !ruby/object:Gem::Version 
-  version: 3.2.4
+  version: 3.2.5
 platform: ruby
 authors: 
 - Sergio Cambra