active_scaffold 3.6.17 → 3.6.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dfa34216419b18c65d503771afc1f0083561f5419963c858df2948b0c3e9ed2
-  data.tar.gz: c4f0d58b4dc6afee868718214fd725c2004898b903d90fd5b94b09133cea6294
+  metadata.gz: f3e15dbddabba45c8d0c75e9cd91a00b805c2f8d9f229e8c4fc1a9bfa08136dd
+  data.tar.gz: 8be97ebe3447c4f77b55e69ee6e6d501c62f342ab49379303a9071c664590a5c
 SHA512:
-  metadata.gz: bfc6d60cb5e2df8fbc367ca6854c173ad94b04bd4309e430ff9c61351ebfe17c3162e50f8c9e6409ad722b8e8298cca8f9da28f9ba0dcc2f3b51e64b114a4844
-  data.tar.gz: ae5b110172f4479df2c3456061a17e289ab222b3143135893c4866d4f3f04f74d1c873e07e71262c992c946450bdabe7f7b9457dd1b15bdbfa5ac2db1e9fa92f
+  metadata.gz: c351ddf8bbd11a8a2540a6f589197f68a9a520eaba6f446b2f53934dc1c100df14ebe99894d40a97f489a132002645c80db8aa4122bbf09e952f3f6f367a84ea
+  data.tar.gz: 35b42d0d6f2d8ffae123b046ede6b5761dfe9910f4922c3dbdf985899c30fbf36fc6696d774d486c888fae774a1c7e390a761fe4f97f8c804b3df1d9b57b95c2

data/CHANGELOG.rdoc

@@ -1,3 +1,11 @@
+= 3.6.19
+- Improve create action in has_many through singular association, supporting more cases
+
+= 3.6.18
+- Add references only for column.search_joins which are in column.includes, and do search_joins for the rest, search_joins default to includes, so won't change behaviour on most cases, but allows to preload some associations without joining in the query
+- Don't define default search_joins, as it may return includes, so search_joins will default to includes unless is defined, and the previous change won't change the behaviour if user doesn't define search_joins
+- Fix update_columns on through association
+
 = 3.6.17
 - Don't add includes or left joins for constrained columns, as they are ignored on sorting clause
 - Fix deprecation on cache counts with rails 5, and fix the queries for rails >= 5.1
@@ -73,7 +81,7 @@
 = 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
+- Fix constraint columns for nested list on through associations
 - Support rails 6.1
 
 = 3.6.0

data/lib/active_scaffold/actions/common_search.rb

@@ -31,6 +31,22 @@ module ActiveScaffold::Actions
         params_hash params[:search]
       end
 
+      def set_outer_joins_for_search(columns)
+        references = []
+        outer_joins = []
+        columns.each do |column|
+          next unless column.search_joins.present?
+          if column.includes.present? && list_columns.include?(column)
+            references << (column.search_joins & column.includes)
+            outer_joins << (column.search_joins - column.includes)
+          else
+            outer_joins << column.search_joins
+          end
+        end
+        active_scaffold_references.concat references.flatten.uniq.compact
+        active_scaffold_outer_joins.concat outer_joins.flatten.uniq.compact
+      end
+
       def store_search_params_into_session
         if active_scaffold_config.store_user_settings
           if params[:search].present?

data/lib/active_scaffold/actions/core.rb

@@ -100,8 +100,7 @@ module ActiveScaffold::Actions
       record = params[:id] ? copy_attributes(find_if_allowed(params[:id], :read)) : new_model
       apply_constraints_to_record(record) unless scope || params[:id]
       create_association_with_parent record, true if nested?
-      value = column_value_from_param_value(record, column, value)
-      record.send "#{column.name}=", value
+      update_column_from_params(record, column, value, true)
       record.id = params[:id]
       record
     end

data/lib/active_scaffold/actions/field_search.rb

@@ -161,10 +161,14 @@ module ActiveScaffold::Actions
           search_condition = self.class.condition_for_column(column, value, text_search)
           next if search_condition.blank?
 
-          joins_for_search_on_column(column, count_includes)
           active_scaffold_conditions << search_condition
           filtered_columns << column
         end
+        if grouped_search? || active_scaffold_config.list.user.count_includes.present?
+          active_scaffold_outer_joins.concat filtered_columns.map(&:search_joins).flatten.uniq.compact
+        else
+          set_outer_joins_for_search filtered_columns
+        end
         if filtered_columns.present? || grouped_search?
           @filtered = active_scaffold_config.field_search.human_conditions ? filtered_columns : true
         end
@@ -172,14 +176,6 @@ module ActiveScaffold::Actions
         active_scaffold_config.list.user.page = nil
       end
 
-      def joins_for_search_on_column(column, count_includes)
-        if count_includes.nil? && column.includes.present? && list_columns.include?(column) && !grouped_search?
-          active_scaffold_references << column.includes
-        elsif column.search_joins.present?
-          active_scaffold_outer_joins << column.search_joins
-        end
-      end
-
       def field_search_ignore?
         active_scaffold_config.list.always_show_search && active_scaffold_config.list.search_partial == 'field_search'
       end

data/lib/active_scaffold/actions/nested.rb

@@ -122,16 +122,21 @@ module ActiveScaffold::Actions
       # has_many is done by beginning_of_chain and rails if direct association, not in through associations
       return false if nested.has_many? && !nested.association.through?
       return false if check_match && !nested.match_model?(active_scaffold_config.model)
-      nested.child_association && nested_parent_record
+      (nested.child_association || nested.create_through_singular?) && nested_parent_record
     end
 
     def create_association_with_parent(record, check_match = false)
       return unless create_association_with_parent?(check_match)
-      if nested.child_association.singular?
+      if nested.child_association&.singular?
         record.send("#{nested.child_association.name}=", nested_parent_record)
-      elsif nested.association.through_singular? && nested.child_association.through_singular?
-        through = nested_parent_record.send(nested.association.through_reflection.name)
-        record.send("#{nested.child_association.through_reflection.name}=", through)
+      elsif nested.create_through_singular?
+        through = nested_parent_record.send(nested.association.through_reflection.name) ||
+          nested_parent_record.send("build_#{nested.association.through_reflection.name}")
+        if nested.source_reflection.reverse_association.collection?
+          record.send(nested.source_reflection.reverse) << through
+        else
+          record.send("#{nested.source_reflection.reverse}=", through)
+        end
       else
         record.send(nested.child_association.name) << nested_parent_record
       end

data/lib/active_scaffold/actions/search.rb

@@ -26,12 +26,7 @@ module ActiveScaffold::Actions
           @filtered = search_conditions.present?
           active_scaffold_conditions.concat search_conditions if @filtered
 
-          references, outer_joins = columns.partition do |column|
-            column.includes.present? && list_columns.include?(column)
-          end
-          active_scaffold_references.concat references.map(&:includes).flatten.uniq.compact
-          active_scaffold_outer_joins.concat outer_joins.map(&:search_joins).flatten.uniq.compact
-
+          set_outer_joins_for_search columns
           active_scaffold_config.list.user.page = nil
         else
           super

data/lib/active_scaffold/data_structures/column.rb

@@ -353,7 +353,6 @@ module ActiveScaffold::DataStructures
       if delegated_association
         self.includes = includes ? [delegated_association.name => includes] : [delegated_association.name]
       end
-      self.search_joins = includes.clone if includes
 
       # default all the configurable variables
       self.css_class = ''

data/lib/active_scaffold/data_structures/nested_info.rb

@@ -94,12 +94,20 @@ module ActiveScaffold::DataStructures
       return false unless through_association?
       return true if association.through_reflection.options[:through] # create not possible, too many levels
       return true if association.source_reflection.options[:through] # create not possible, too many levels
-      return false if association.through_singular? # create allowed, AS has code for this
+      return false if create_through_singular? # create allowed, AS has code for this
 
       # create allowed only if through reflection in record to be created is included in create columns
       !child_association || !columns.include?(child_association.through_reflection.name)
     end
 
+    def create_through_singular?
+      association.through_singular? && source_reflection.reverse
+    end
+
+    def source_reflection
+      @source_reflection ||= ActiveScaffold::DataStructures::Association::ActiveRecord.new(association.source_reflection)
+    end
+
     def through_association?
       association.through?
     end

data/lib/active_scaffold/tableless.rb

@@ -78,7 +78,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
           class << scope; include RelationExtension; end
           assoc_conditions = scope.proxy_association&.send(:association_scope)&.conditions
           if assoc_conditions&.present?
-            scope.conditions.concat assoc_conditions.map { |c| c.is_a?(Hash) ? c[klass.table_name] || c : c }
+            scope.conditions.concat(assoc_conditions.map { |c| c.is_a?(Hash) ? c[klass.table_name] || c : c })
           end
         end
       end
@@ -167,10 +167,11 @@ class ActiveScaffold::Tableless < ActiveRecord::Base # rubocop:disable Rails/App
     end
 
     def exists?
-      size > 0
+      size.positive?
     end
 
     private
+
     def exec_queries
       @records = @klass.find_all(self)
       @loaded = true

data/lib/active_scaffold/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.6.17
+  version: 3.6.19
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-01 00:00:00.000000000 Z
+date: 2023-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails