active_scaffold_sortable 3.3.8 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd0a221046cbdc19c69cc2c089ef9880034030c1950d61f0ea6fe57a25b1b977
-  data.tar.gz: 8a151d833254e145a5d57ae6af4b9c3534f250bcaf84bba07a9991f05e43fb38
+  metadata.gz: 32d846a77db73022d77fae9f89593c42fc18f4146a1c694ad3deb66b02e2b1cd
+  data.tar.gz: 8d82537f1748352064e4100c03feaa663369c45cde7c35ce743f52e34f7c4204
 SHA512:
-  metadata.gz: bb046c74e08e3f5c362efa2bce57f575499ee08d86452d39909121acbb4fb89a80217ba7fe686b50dfee6bb7c74a840d7a4422744b6725ca6fdb5c31416ed2a5
-  data.tar.gz: 7eee82cf921194f5764a0984b9a700c235a8c9f39a4281f983866d592b6c642d68303aba45eddd4ad9216984ede14d9e2156ce2d80f2ecefac015b331c4f44e9
+  metadata.gz: e31694f1969a08cb691c27efae01488e6b255913b13dddb82abdb1c1a925f763b6cdc754c8e9cba002f50181baed071e370e788ad5b2fbc2896ddc7fb5d66456
+  data.tar.gz: 233c34441179b5478ab70f7afeda6d5c4c7b731f2db9611c0d110c7821496bae33ff83644678520b4cd3c363740157673d06517608ae187656b6628a89c66695

data/app/assets/javascripts/jquery/active_scaffold_sortable.js

@@ -37,7 +37,7 @@ ActiveScaffold.sortable = function(element) {
     element = jQuery(element);
     form = element.closest('form.as_form').length > 0;
     if (form) content = element;
-    else content = element.find('.records:first');
+    else content = element.find(element.data('contentSelector') || '.records:first');
   }
   
   if (form) {
@@ -49,7 +49,8 @@ ActiveScaffold.sortable = function(element) {
     if (url) {
       var csrf = jQuery('meta[name=csrf-param]').attr('content') + '=' + jQuery('meta[name=csrf-token]').attr('content');
       sortable_options.update = function(event, ui) {
-        var body = jQuery(this).sortable('serialize',{key: encodeURIComponent(jQuery(this).attr('id') + '[]'), expression: new RegExp(element.data('format'))});
+        var $this = jQuery(this),
+          body = $this.sortable('serialize',{key: encodeURIComponent(($this.data('key') || $this.attr('id')) + '[]'), expression: new RegExp(element.data('format'))});
         var params = element.data('with');
         if (params) body += '&' + params;
         jQuery.post(url, body + '&' + csrf);

data/frontends/default/active_scaffold_overrides/reorder.js.erb

@@ -1,5 +1,5 @@
 <% if active_scaffold_config.sortable.refresh_list %>
-<%= render :partial => 'refresh_list' %>
+<%= render 'refresh_list', no_history: true %>
 <% else %>
 ActiveScaffold.stripe('<%= active_scaffold_tbody_id %>');
 <% end %>

data/lib/active_scaffold/actions/sortable.rb

@@ -24,14 +24,12 @@ module ActiveScaffold::Actions
     def reorder
       model = active_scaffold_config.model
       
-      unless (model.instance_methods & [:nested_set_scope, 'nested_set_scope']).empty?
+      if (model.instance_methods & [:nested_set_scope, 'nested_set_scope']).present?
         reorder_children_in_tree(model)
+      elsif model.respond_to? :ancestry_column
+        reorder_ancestry_tree(model)
       else
-        if model.respond_to? :ancestry_column
-          reorder_ancestry_tree(model) 
-        else
-          reorder_simple_list(model)
-        end
+        reorder_simple_list(model)
       end
       do_refresh_list if active_scaffold_config.sortable.refresh_list
     end
@@ -52,9 +50,11 @@ module ActiveScaffold::Actions
     end
     
     def reorder_simple_list(model)
+      updates = ActiveScaffold::OrmChecks.columns_hash(model)['updated_at'] ? {updated_at: Time.now} : {}
       column_name = active_scaffold_config.sortable.column.name
       ordered_ids.each.with_index do |id, index|
-        model.where(model.primary_key => id).update_all(column_name => index + 1)
+        updates[column_name] = index + 1
+        model.where(model.primary_key => id).update_all(updates)
       end
     end
     

data/lib/active_scaffold_sortable/version.rb

@@ -1,8 +1,8 @@
 module ActiveScaffoldSortable
   module Version
     MAJOR = 3
-    MINOR = 3
-    PATCH = 8
+    MINOR = 4
+    PATCH = 0
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_sortable
 version: !ruby/object:Gem::Version
-  version: 3.3.8
+  version: 3.4.0
 platform: ruby
 authors:
 - Sergio Cambra
 - Volker Hochstein
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2024-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold
@@ -70,7 +70,7 @@ homepage: http://github.com/activescaffold/active_scaffold_sortable
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -85,9 +85,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Drag n Drop Sorting for Activescaffold
 test_files: