active_scaffold 3.6.0 → 3.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c98847307a3be61b8137eba789a6e1779c2c9dccc9190b8c4d50428d6dffd33
-  data.tar.gz: f82b68052234f72ac8bc715eb88f7aabaed422e8ef8b929b63244e9d3cf5500d
+  metadata.gz: c2aecb1c0513a318aeaa726f5c077b7b8f31608861890f316615187e6e53e7a8
+  data.tar.gz: de1535be3e41666fcf2e7a9a50b61a39d328466f3094a8d0089a83fe8ab56c98
 SHA512:
-  metadata.gz: a60af5b75baee4785e3ad1bc3353a59db2e2677aa14f82eabac52dd5d732486185731e1f2e66cb35f3bf3ebac14322ea3038bdca39c497bd163a600566d13198
-  data.tar.gz: 59bddf1ef940582d370591bd4003408505733abd2c45f7cac115f3033d8925266f92339c1deb6aae2c484a73ebe27e137d6b518b3199064fea187f5726f35ba4
+  metadata.gz: 29d77b4bdf5901be5b856242aee5a511208541dd7ef70e83e06ad0c411999406ab39e4bfe2ed864ed88da8d0aa7369df023b823f00be9dfdfa87a0e6b44e06e4
+  data.tar.gz: e00f0ade90a6a1a4e62f7b3590bd039aed8d8b5d9a00f9d6d1e12d68662aed6be672aec16563bd5014bda61810e3cedcbbb178070b052e2f8a5eb26bbc46b2b9

data/CHANGELOG.rdoc

@@ -1,3 +1,22 @@
+= 3.6.4
+- Fix country_select bridge for latest gem version
+
+= 3.6.3
+- Fix search on nested or embedded lists with rails_ujs
+- Fix inplace edit when collection action link opens a view with table and th
+
+= 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
+- Support rails 6.1
+
+= 3.6.0
 - Fix i18n at ruby 3.0.0
 - Add list helper for bitfield column, so it display labels of selected checkboxes in list
 - Support rails 6.0

data/README.md

@@ -9,14 +9,13 @@ 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
 --------------
-3-6-stable supports rails >= 4.2.x and ruby >= 2.3.0
-3-5-stable supports rails >= 4.0.x and ruby >= 2.0.0  
-3-4-stable supports rails >= 3.2.x and ruby >= 1.9.3  
-3-3-stable supports rails >= 3.2.x and ruby >= 1.8  
+3-5-stable supports rails >= 4.0.x and <= 5.1.x, and ruby >= 2.0.0  
+3-4-stable supports rails >= 3.2.x and <= 4.2.x, and ruby >= 1.9.3  
+3-3-stable supports rails 3.2.x and ruby >= 1.8  
 rails-3.2 supports Rails 3.1 & 3.2, and is the current source of the 3.2.x line of gems.
 
 Quick Start

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

@@ -1024,7 +1024,7 @@ var ActiveScaffold = {
 
       if (my_parent.is('td')) {
         var column_no = my_parent.prevAll('td').length;
-        column_heading = my_parent.closest('.active-scaffold').find('th:eq(' + column_no + ')');
+        column_heading = my_parent.closest('table').find('th:eq(' + column_no + ')');
       } else if (my_parent.is('th')) {
         column_heading = my_parent;
       }

data/app/views/active_scaffold_overrides/_field_search.html.erb

@@ -9,8 +9,16 @@
     data: {loading: true},
     method: :get
   }
+  
+  hidden_params = url_options.except(:controller, :action, :id, :search).to_query.split(Rack::Utils::DEFAULT_SEP)
 -%>
+
 <%= form_tag url_options, options %>
+  <% hidden_params.each do |pair| -%>
+    <% key, value = pair.split('=', 2).map { |str| Rack::Utils.unescape(str) } -%>
+    <%= hidden_field_tag(key, value) %>
+  <% end -%>
+  
   <ol class="form">
     <% visibles, hiddens = visibles_and_hiddens(active_scaffold_config.field_search) %>
     <% visibles.each do |column| -%>

data/app/views/active_scaffold_overrides/_form_association_record.html.erb

@@ -84,10 +84,24 @@
 
   <% columns_groups.each do |columns_group| %>
   <%= content_tag row_tag, :class => 'associated-record' do %>
-    <%= content_tag column_tag, :colspan => (columns_length if column_tag == :td) do %>
-    <% columns_group.each_column(for: record.class, crud_type: :read, flatten: true) do |col| %>
-      <%= active_scaffold_render_subform_column(col, scope, crud_type, readonly, true, record) %>
-    <% end %>
+    <% if layout == :vertical %>
+      <% columns_group.each_column(for: record.class, crud_type: :read, flatten: true) do |col| %>
+        <%
+          col_class = default_col_class.clone
+          col_class << 'required' if col.required?
+          col_class << col.css_class unless col.css_class.nil? || col.css_class.is_a?(Proc)
+          col_class << 'hidden' if column_renders_as(col) == :hidden
+        %>
+        <%= content_tag column_tag, :class => col_class, :colspan => (columns_length if column_tag == :td) do %>
+          <%= active_scaffold_render_subform_column(col, scope, crud_type, readonly, false, record) %>
+        <% end %>
+      <% end %>
+    <% else %>
+      <%= content_tag column_tag, :colspan => (columns_length if column_tag == :td) do %>
+      <% columns_group.each_column(for: record.class, crud_type: :read, flatten: true) do |col| %>
+        <%= active_scaffold_render_subform_column(col, scope, crud_type, readonly, true, record) %>
+      <% end %>
+      <% end %>
     <% end %>
   <% end %>
   <% end %>

data/app/views/active_scaffold_overrides/_search.html.erb

@@ -10,8 +10,15 @@
     data: {loading: true},
     method: :get
   }
+  
+  hidden_params = url_options.except(:controller, :action, :id, :search).to_query.split(Rack::Utils::DEFAULT_SEP)
 -%>
+
 <%= form_tag url_options, options do %>
+  <% hidden_params.each do |pair| -%>
+    <% key, value = pair.split('=', 2).map { |str| Rack::Utils.unescape(str) } -%>
+    <%= hidden_field_tag(key, value) %>
+  <% end -%>
   <%= search_field_tag :search, (search_params if search_params.is_a? String), :class => 'text-input', :id => search_input_id, :size => 50, :autocomplete => :off, :placeholder => as_(live_search ? :live_search : :search_terms) %>
   <%= submit_tag as_(submit_text), :class => "submit", :style => ('display:none;' if live_search) %>
   <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), :class => 'as_cancel reset', :remote => true, :data => {:refresh => true} unless local_assigns[:skip_reset] %>

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/bridges/country_select/country_select_bridge_helper.rb

@@ -2,7 +2,8 @@ module ActiveScaffold::Bridges
   class CountrySelect
     module FormColumnHelpers
       def active_scaffold_input_country(column, options)
-        select_options = {:prompt => as_(:_select_), :priority_countries => column.options[:priority] || [:us], :format => column.options[:format]}
+        select_options = {:prompt => as_(:_select_), :priority_countries => column.options[:priority] || [:us]}
+        select_options[:format] = column.options[:format]
         select_options.merge!(options)
         options.reverse_merge!(column.options).except!(:prompt, :priority, :format)
         active_scaffold_select_name_with_multiple options

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/data_structures/nested_info.rb

@@ -131,8 +131,8 @@ module ActiveScaffold::DataStructures
     protected
 
     def setup_constrained_fields
-      @constrained_fields = Array(association.foreign_key).map(&:to_sym) unless association.belongs_to?
-      @constrained_fields ||= []
+      @constrained_fields = [] if association.belongs_to? || association.through?
+      @constrained_fields ||= Array(association.foreign_key).map(&:to_sym)
       return unless child_association && child_association != association
 
       @constrained_fields << child_association.name

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/helpers/search_column_helpers.rb

@@ -245,16 +245,23 @@ module ActiveScaffold
         options = column.options.merge(options)
         type = "#{'date' unless options[:discard_date]}#{'time' unless options[:discard_time]}"
         use_select = options.delete(:use_select)
-        helper = use_select ? "select_#{type}" : "#{type}#{'_local' if type == 'datetime'}_field"
+        from_name = "#{options[:name]}[from]"
+        to_name = "#{options[:name]}[to]"
         if use_select
-          default_from_options = {include_blank: true, prefix: "#{options[:name]}[from]"}
-          default_to_options = {include_blank: true, prefix: "#{options[:name]}[to]"}
+          helper = "select_#{type}"
+          fields = [
+            send(helper, field_search_datetime_value(from_value), options.reverse_merge(include_blank: true, prefix: from_name)),
+            send(helper, field_search_datetime_value(to_value), options.reverse_merge(include_blank: true, prefix: to_name))
+          ]
+        else
+          helper = "#{type}#{'_local' if type == 'datetime'}_field_tag"
+          fields = [
+            send(helper, from_name, field_search_datetime_value(from_value), options.except(:name, :object).merge(id: "#{options[:id]}_from")),
+            send(helper, to_name, field_search_datetime_value(to_value), options.except(:name, :object).merge(id: "#{options[:id]}_to"))
+          ]
         end
 
-        safe_join [
-          send(helper, field_search_datetime_value(from_value), options.reverse_merge(default_from_options || {})),
-          send(helper, field_search_datetime_value(to_value), options.reverse_merge(default_to_options || {}))
-        ], ' - '
+        safe_join fields, ' - '
       end
 
       def active_scaffold_search_date(column, options)

data/lib/active_scaffold/tableless.rb

@@ -44,7 +44,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
 
   class Column < ActiveRecord::ConnectionAdapters::Column
     if Rails.version >= '5.0.0'
-      def initialize(name, default, sql_type = nil, null = true)
+      def initialize(name, default, sql_type = nil, null = true, **)
         metadata = ActiveRecord::Base.connection.send :fetch_type_metadata, sql_type
         super(name, default, metadata, null)
       end

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 6
-    PATCH = 0
+    PATCH = 4
 
     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

data/test/misc/constraints_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module ModelStubs
   class ModelStub < ActiveRecord::Base
     self.abstract_class = true
-    def self.columns; @columns ||= [ColumnMock.new('foo', '')] end
+    def self.columns; @columns ||= [ColumnMock.new('foo', '', 'string')] end
 
     def self.columns_hash; @hash ||= Hash[@columns.map { |c| [c.name, c] }] end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.4
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-21 00:00:00.000000000 Z
+date: 2022-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,6 +17,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: cow_proxy
   requirement: !ruby/object:Gem::Requirement
@@ -469,8 +475,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.11
+rubygems_version: 3.0.9
 signing_key:
 specification_version: 4
 summary: Rails 4.x and 5.x versions of ActiveScaffold supporting prototype and jquery