active_scaffold 3.6.1 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4c1c30d71374c44ba52365fd42ce5e355d0a247581d210098efe40ac62f1b61
-  data.tar.gz: ca952b27376c9a12b12b3e9bcfde73c33fd0976f4e3490a3a3d1c2a97d1db0bd
+  metadata.gz: d35f441c2847444fd7e591e529085d3613774e19b0dc2b87a6a7e046e39eb95a
+  data.tar.gz: 5028894d44f4ed52a7e3cf7f4f92d38d86c48221815ccbb2f28396ecbda447ec
 SHA512:
-  metadata.gz: 72400accea68b295f7b8fe5b1da561d98111d7026a8f63062fe6cec0d949cc9f93108231e09f443214f4079698aba0e1ab0b736df1e0a611b6c1289713516847
-  data.tar.gz: 46e0658d19bf28f6f71a01a540fdb98cae584d8d72153f828e30c68ff92c8723e72c19bc22e99981082faed49455ca8768f6416a2e6366f4a6b0b29552b9ab2c
+  metadata.gz: 0d92dc0e4e6933a0849269191d4b273083e6914606a3198ccd132754f1ef4607434d7ef5cf6e51268aa34c7c926613f75214aa5b1ac961a0784ca5b8a34133c3
+  data.tar.gz: b87a086b26a98a148a485fe9af2c55e483dbbb82a1ccc4231d7e468a4f5265022bef3899e05ae6e6af1fef63295456f43f2456ba17043f42e42a7a796bcdffde

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+= 3.6.2
+- Fix count query when association's primary key is string
+- Fix unauthorized_columns and constraint_columns with threadsafe enabled
+- Fix changing list.sorting and column.sort_by per request when threadsafe is enabled
+
+= 3.6.1
 - Display group cols vertically when subform layout is vertical
 - Fix html attributes for input datetime on field search, when jquery ui is not used
 - Fix constraint columns for nested list on through assocaitions

data/README.md

@@ -9,7 +9,7 @@ Overview
 [![Inline docs](https://inch-ci.org/github/activescaffold/active_scaffold.svg?branch=master)](https://inch-ci.org/github/activescaffold/active_scaffold)
 [![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://opensource.org/licenses/MIT)
 
-ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, read, update, delete) operations for Rails applications. It offers additonal features including searching, pagination & layout control.  Rails >= 4.2.0 and Rails < 6.1 is supported, ruby >= 2.3 required.
+ActiveScaffold provides a quick and powerful user interfaces for CRUD (create, read, update, delete) operations for Rails applications. It offers additonal features including searching, pagination & layout control.  Rails >= 4.2.0 and Rails <= 6.1 is supported, ruby >= 2.3 required.
 
 Branch Details
 --------------

data/lib/active_scaffold/actions/list.rb

@@ -161,7 +161,7 @@ module ActiveScaffold::Actions
 
     def count_query_on_association_class(column)
       key = column.association.primary_key || :id
-      query = column.association.klass.where(column.association.foreign_key => @records.map(&key))
+      query = column.association.klass.where(column.association.foreign_key => @records.map(&key.to_sym))
       if column.association.as
         query.where!(column.association.reverse_association.foreign_type => active_scaffold_config.model.name)
       end

data/lib/active_scaffold/config/list.rb

@@ -292,7 +292,7 @@ module ActiveScaffold::Config
             @_sorting = sorting
           else
             @_sorting = default_sorting
-            @_sorting.set(@sorting) if @sorting
+            @_sorting.set(*@sorting) if @sorting
             if @conf.columns.constraint_columns.present?
               @_sorting.constraint_columns = @conf.columns.constraint_columns
             end

data/lib/active_scaffold/data_structures/action_columns.rb

@@ -124,7 +124,7 @@ module ActiveScaffold::DataStructures
     end
 
     def action_name
-      @action.class.name.demodulize.underscore
+      @action.user_settings_key
     end
 
     def columns_key

data/lib/active_scaffold/extensions/cow_proxy.rb

@@ -18,10 +18,6 @@ module CowProxy
           end
           super
         end
-
-        def sort_by(options)
-          @sort = options
-        end
       end
 
       class Set < ::CowProxy::WrapClass(::ActiveScaffold::DataStructures::Set)

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 6
-    PATCH = 1
+    PATCH = 2
 
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end

data/test/data_structures/action_columns_test.rb

@@ -5,7 +5,7 @@ require 'test_helper'
 class ActionColumnsTest < MiniTest::Test
   def setup
     @columns = ActiveScaffold::DataStructures::ActionColumns.new(%i[a b])
-    @columns.action = stub(:core => stub(:model_id => 'model_stub'))
+    @columns.action = stub(core: stub(model_id: 'model_stub'), user_settings_key: :"model_stub_active_scaffold/config/test")
   end
 
   def test_label

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.6.2
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-29 00:00:00.000000000 Z
+date: 2021-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails