active_scaffold_batch 3.6.1 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e95a8d9d4e5992e891a21ce962d70afafe38fec0ec4657c7a83d2fe7cbb92029
-  data.tar.gz: be53b9d4c5c36a261ecec93d28408bed9f13d9772d1029121ad9d43ea9431073
+  metadata.gz: d7da29c82528f1fd8e72cb8afab1e35335d1502dd694e2e844557243cdddca15
+  data.tar.gz: 125342e2141966e6da5e56b802d35a15a9166d9d1c8c77652d9e1684b0eb7712
 SHA512:
-  metadata.gz: da80d681008c619906e14e6442e156fd9ddc3109ad0c58f08a9d92dcb2521be1c6e51dd449a777ce837c6043b6af667b7f206d7cf4954b7d6f7884caf9098971
-  data.tar.gz: ba40cf458703959ec5d4a8a12a192372754be3bb772ae017efe252ddceb075c11b710344ec0849d0f2934f385a3173378365e6d474c913a4b2994e4caeff4ce0
+  metadata.gz: e5272ba21913d198e515020426287a7a9de63c90ab05d3a98970a523c1f9d17cf20f78f5f635e267e41a49adb6449bc1099fd5a1cc7791dfe1d40ff0e9baf17e
+  data.tar.gz: 289b53b5e2919831fb2582ecd7dcf54892c12c7388f03b4acbffcd878641f8ed6736ac712f658d4e4bf04b91a0dd4f3fe93a40b6e263f23ced9b6374824177ef

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

@@ -9,7 +9,8 @@
 <tr class="form_record">
 <% columns.each_column(flatten: true) do |column| -%>
 <%
-  next if column_renders_as(column) == :hidden
+  renders_as = column_renders_as(column)
+  next if renders_as == :hidden
   next unless record.authorized_for?(:crud_type => :create, :column => column.name) 
   column = column.clone
   column.form_ui ||= :select if column.association
@@ -19,7 +20,7 @@
   col_class << column.css_class unless column.css_class.nil?
 -%>
   <td class="<%= col_class.join(' ') %>">
-    <%= render :partial => form_partial_for_column(column), :locals => { :column => column, :scope => scope, :record => record } -%>
+    <%= render_column(column, record, renders_as, scope) %>
   </td>
 <% end -%>
   <td><%= batch_create_multiple_remove_link unless first %></td>

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

@@ -1,7 +1,12 @@
 <div id="<%= element_form_id :action => form_action %>-content" class="multiple">
-<% first = true -%>
-<% records.each do |scope, record| -%>
-  <%= render :partial => 'batch_create_form_vertical_record', :locals => { :columns => columns, :form_action => form_action, :scope => "[#{scope}]", :first => first, :record => record } %>
-  <% first = false -%>
-<% end -%>
+  <%
+    first = true
+    original_record = @record
+  -%>
+  <% records.each do |scope, record| -%>
+    <% @record = record %>
+    <%= render :partial => 'batch_create_form_vertical_record', :locals => { :columns => columns, :form_action => form_action, :scope => "[#{scope}]", :first => first, :record => record } %>
+    <% first = false -%>
+  <% end -%>
 </div>
+<% @record = original_record %>

data/lib/active_scaffold/actions/batch_destroy.rb

@@ -24,7 +24,7 @@ module ActiveScaffold::Actions
       when :delete_all then
         do_search if respond_to? :do_search, true
         # dummy condition cause we have to call delete_all on relation not on association
-        beginning_of_chain.where('1=1').delete_all(all_conditions)
+        filtered_query.where('1=1').delete_all(all_conditions)
       else
         Rails.logger.error("Unknown process_mode: #{active_scaffold_config.batch_destroy.process_mode} for action batch_destroy")
       end

data/lib/active_scaffold/config/batch_create.rb

@@ -71,8 +71,8 @@ module ActiveScaffold::Config
     end
 
     # the label= method already exists in the Form base class
-    def label(model = nil)
-      model ||= @core.label(:count => 2)
+    def label(model = nil, core: @core)
+      model ||= core.label(:count => 2)
       @label ? as_(@label) : as_(:create_model, :model => model)
     end
   end

data/lib/active_scaffold/config/batch_destroy.rb

@@ -40,11 +40,6 @@ module ActiveScaffold::Config
     # the ActionLink for this action
     attr_accessor :link
 
-    # the label= method already exists in the Form base class
-    def label(model = nil)
-      model ||= @core.label(:count => 2)
-      @label ? as_(@label) : as_(:delete_model, :model => model)
-    end
-
+    undef_method :label=
   end
 end

data/lib/active_scaffold/config/batch_update.rb

@@ -44,8 +44,8 @@ module ActiveScaffold::Config
 
 
     # the label= method already exists in the Form base class
-    def label(model = nil)
-      model ||= @core.label(:count => 2)
+    def label(model = nil, core: @core)
+      model ||= core.label(:count => 2)
       @label ? as_(@label) : as_(:update_model, :model => model)
     end
   end

data/lib/active_scaffold_batch/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_batch
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.7.1
 platform: ruby
 authors:
 - Sergio Cambra
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-02 00:00:00.000000000 Z
+date: 2025-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_scaffold
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 4.1.0
 description: You want to destroy/update many records at once with activescaffold?
 email: activescaffold@googlegroups.com
 executables: []