active_scaffold_batch 3.6.0 → 3.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25a23099a78f0bde754da39292fe4a2ca1a91677370a80f2f1b7ed8d905a82bc
-  data.tar.gz: c1d61b39ac4a20f6f4ae990df1c04a0ccad901f837694604b4e3e0ed822f7305
+  metadata.gz: e95a8d9d4e5992e891a21ce962d70afafe38fec0ec4657c7a83d2fe7cbb92029
+  data.tar.gz: be53b9d4c5c36a261ecec93d28408bed9f13d9772d1029121ad9d43ea9431073
 SHA512:
-  metadata.gz: 654007dbb21b63aead7452b73c81ab6b6d66526c4be3a69f7b4235e8da065b9a398c7a17dce31c33b845df0e5701ab624461bfd60a91ae66c074b41819dfe67a
-  data.tar.gz: 651b7fda58c523582d2916360476856b9e32ea233c319cb177775dc2bfa8dd1135fbd51f6c26cf895c1c8980e6fdeecf359d96b148b6ca6bdf18d43c64f22d94
+  metadata.gz: da80d681008c619906e14e6442e156fd9ddc3109ad0c58f08a9d92dcb2521be1c6e51dd449a777ce837c6043b6af667b7f206d7cf4954b7d6f7884caf9098971
+  data.tar.gz: ba40cf458703959ec5d4a8a12a192372754be3bb772ae017efe252ddceb075c11b710344ec0849d0f2934f385a3173378365e6d474c913a4b2994e4caeff4ce0

data/app/assets/javascripts/active_scaffold_batch.js

@@ -10,4 +10,10 @@ jQuery(document).ready(function() {
     record.prev('.form_record-errors').remove();
     record.remove();
   });
+  jQuery(document).on('change', 'select.as_update_date_operator, select.as_batch_update_operator', function(event) {
+    ActiveScaffold[jQuery(this).val() === 'REPLACE' ? 'show' : 'hide'](jQuery(this).next());
+  });
+  jQuery(document).on('change', 'select.as_update_date_operator', function(event) {
+    ActiveScaffold[['REPLACE', 'NO_UPDATE', 'NULL'].indexOf(jQuery(this).val()) !== -1 ? 'hide' : 'show'](jQuery(this).next().next());
+  });
 });

data/lib/active_scaffold/actions/batch_update.rb

@@ -217,7 +217,8 @@ module ActiveScaffold::Actions
     alias_method :batch_update_value_for_float, :batch_update_value_for_numeric
 
     def batch_update_all_value_for_numeric(column, calculation_info)
-      if ActiveScaffold::Actions::BatchUpdate::GenericOperators.include?(calculation_info[:operator]) || ActiveScaffold::Actions::BatchUpdate::NumericOperators.include?(calculation_info[:operator])
+      operator = calculation_info[:operator]
+      if operator == 'NULL' || ActiveScaffold::Actions::BatchUpdate::GenericOperators.include?(operator) || ActiveScaffold::Actions::BatchUpdate::NumericOperators.include?(operator)
         operand = active_scaffold_config.model.quote_value(self.class.condition_value_for_numeric(column, calculation_info[:value]))
         if calculation_info[:opt] == 'PERCENT'
           operand = "#{active_scaffold_config.model.connection.quote_column_name(column.name)} / 100.0 * #{operand}"
@@ -242,18 +243,18 @@ module ActiveScaffold::Actions
 
     def batch_update_value_for_date_picker(column, record, calculation_info)
       current_value = record.send(column.name)
-      {"number"=>"", "unit"=>"DAYS", "value"=>"November 16, 2010", "operator"=>"REPLACE"}
-      if ActiveScaffold::Actions::BatchUpdate::GenericOperators.include?(calculation_info[:operator]) || ActiveScaffold::Actions::BatchUpdate::DateOperators.include?(calculation_info[:operator])
+      operator = calculation_info[:operator]
+      if operator == 'NULL' || ActiveScaffold::Actions::BatchUpdate::GenericOperators.include?(operator) || ActiveScaffold::Actions::BatchUpdate::DateOperators.include?(operator)
         operand = self.class.condition_value_for_datetime(column, calculation_info[:value], column.column.type == :date ? :to_date : :to_time)
         case calculation_info[:operator]
         when 'REPLACE' then operand
         when 'NULL' then nil
         when 'PLUS' then
           trend_number = [calculation_info['number'].to_i,  1].max
-          current_value.in((trend_number).send(calculation_info['unit'].downcase.singularize.to_sym))
+          current_value&.in((trend_number).send(calculation_info['unit'].downcase.singularize.to_sym))
         when 'MINUS' then
           trend_number = [calculation_info['number'].to_i,  1].max
-          current_value.ago((trend_number).send(calculation_info['unit'].downcase.singularize.to_sym))
+          current_value&.ago((trend_number).send(calculation_info['unit'].downcase.singularize.to_sym))
         else
           current_value
         end
@@ -261,7 +262,6 @@ module ActiveScaffold::Actions
         current_value
       end
     end
-    alias_method :batch_update_value_for_calendar_date_select, :batch_update_value_for_date_picker
 
     def override_batch_update_value(form_ui)
       method = "batch_update_value_for_#{form_ui}"

data/lib/active_scaffold/helpers/datepicker_update_column_helpers.rb

@@ -3,26 +3,25 @@ module ActiveScaffold
     module DatepickerUpdateColumnHelpers
       def active_scaffold_update_date_picker(column, options)
         current_params = {:value => nil, :number => nil, :unit => nil, :operator => 'NO_UPDATE'}
-        current_params.merge!(batch_update_values[column.name][:value].symbolize_keys) if batch_update_values[column.name] && batch_update_values[column.name][:value]
+        current_params.merge!(batch_update_values[column.name][:value].symbolize_keys) if batch_update_values.dig(column.name, :value)
         operator_options = active_scaffold_update_generic_operators(column)
         operator_options.concat(ActiveScaffold::Actions::BatchUpdate::DateOperators.collect {|comp| [as_(comp.downcase.to_sym), comp]}) if active_scaffold_config.batch_update.process_mode == :update
         options = options.merge(:show => ['PLUS', 'MINUS'].exclude?(current_params[:operator]))
         tags = []
-        tags << select_tag("[record][#{column.name}][operator]",
+        tags << select_tag("#{options[:name]}[operator]",
                 options_for_select(operator_options, current_params[:operator]),
                   :id => "#{options[:id]}_operator",
                   :class => "text-input as_update_date_operator")
-        tags << active_scaffold_search_date_bridge_calendar_control(column, options, current_params[:value], 'value')
+        tags << active_scaffold_search_date_picker_field(column, options.merge(show: current_params[:operator] == 'REPLACE'), current_params[:value], 'value')
         tags << active_scaffold_update_date_bridge_trend_tag(column, current_params, options)
         tags.join("&nbsp;").html_safe
       end
 
       def active_scaffold_update_date_bridge_trend_tag(column, current_params, options)
-        active_scaffold_date_bridge_trend_tag(column, options,
-                                             {:name_prefix => '[record]',
-                                              :number_value => current_params[:number],
-                                              :unit_value => current_params[:unit],
-                                              :show => ['PLUS','MINUS'].include?(current_params[:operator])})
+        active_scaffold_search_datetime_trend_tag(column, options,
+                                             {'number' => current_params[:number],
+                                              'unit' => current_params[:unit],
+                                              show: ['PLUS','MINUS'].include?(current_params[:operator])})
       end
     end
   end

data/lib/active_scaffold/helpers/update_column_helpers.rb

@@ -17,7 +17,9 @@ module ActiveScaffold
        elsif column.column and column.form_ui.nil? and (method = override_update(column.column.type))
           send(method, column, options)
         else
-          active_scaffold_update_generic_operators_select(column, options)<< ' ' << active_scaffold_render_input(column, options.merge(:name => "record[#{column.name}][value]"))
+          show_field = batch_update_values.dig(column.name, :value, :operator) == 'REPLACE'
+          active_scaffold_update_generic_operators_select(column, options) << ' ' <<
+            active_scaffold_render_input(column, options.merge(name: "record[#{column.name}][value]", style: ('display: none;' unless show_field)))
         end
       end
 
@@ -31,8 +33,8 @@ module ActiveScaffold
 
       def active_scaffold_update_generic_operators_select(column, options)
         current = {:operator => 'NO_UPDATE'}
-        current.merge!(batch_update_values[column.name][:value].symbolize_keys) if batch_update_values[column.name] && batch_update_values[column.name][:value]
-        select_tag("[record][#{column.name}][operator]",
+        current.merge!(batch_update_values[column.name][:value].symbolize_keys) if batch_update_values.dig(column.name, :value)
+        select_tag("record[#{column.name}][operator]",
               options_for_select(active_scaffold_update_generic_operators(column), current[:operator]),
               :id => "#{options[:id]}_operator",
               :class => "as_batch_update_operator text_input")
@@ -43,12 +45,12 @@ module ActiveScaffold
         current.merge!(batch_update_values[column.name][:value].symbolize_keys) if batch_update_values[column.name] && batch_update_values[column.name][:value]
         operator_options = active_scaffold_update_generic_operators(column) + ActiveScaffold::Actions::BatchUpdate::NumericOperators.collect {|comp| [as_(comp.downcase.to_sym), comp]}
         select_options = ActiveScaffold::Actions::BatchUpdate::NumericOptions.collect {|comp| [as_(comp.downcase.to_sym), comp]}
-        html = select_tag("[record][#{column.name}][operator]",
+        html = select_tag("record[#{column.name}][operator]",
               options_for_select(operator_options, current[:operator]),
               :id => "#{options[:id]}_operator",
               :class => "as_update_numeric_option")
-        html << ' ' << text_field_tag("[record][#{column.name}][value]", current[:value], active_scaffold_input_text_options)
-        html << ' ' << select_tag("[record][#{column.name}][opt]",
+        html << ' ' << text_field_tag("record[#{column.name}][value]", current[:value], active_scaffold_input_text_options)
+        html << ' ' << select_tag("record[#{column.name}][opt]",
               options_for_select(select_options, current[:opt]),
               :id => "#{options[:id]}_opt",
               :class => "as_update_numeric_option")

data/lib/active_scaffold_batch/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold_batch
 version: !ruby/object:Gem::Version
-  version: 3.6.0
+  version: 3.6.1
 platform: ruby
 authors:
 - Sergio Cambra
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-04 00:00:00.000000000 Z
+date: 2025-04-02 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.0.rc1
+        version: 4.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0.rc1
+        version: 4.0.4
 description: You want to destroy/update many records at once with activescaffold?
 email: activescaffold@googlegroups.com
 executables: []
@@ -68,7 +68,6 @@ files:
 - lib/active_scaffold/config/batch_destroy.rb
 - lib/active_scaffold/config/batch_update.rb
 - lib/active_scaffold/helpers/batch_create_column_helpers.rb
-- lib/active_scaffold/helpers/calendar_date_select_update_column_helpers.rb
 - lib/active_scaffold/helpers/datepicker_update_column_helpers.rb
 - lib/active_scaffold/helpers/update_column_helpers.rb
 - lib/active_scaffold_batch.rb

data/lib/active_scaffold/helpers/calendar_date_select_update_column_helpers.rb

@@ -1,33 +0,0 @@
-module ActiveScaffold
-  module Helpers
-    module CalendarDateSelectUpdateColumnHelpers
-      def active_scaffold_update_calendar_date_select(column, options)
-        current_params = {:value => nil, :number => nil, :unit => nil, :operator => 'NO_UPDATE'}
-        current_params.merge!(batch_update_values[column.name][:value].symbolize_keys) if batch_update_values[column.name] && batch_update_values[column.name][:value]
-        Rails.logger.info("update_date column: #{column.name}: #{current_params[:value].inspect}, class: #{current_params[:value].class}")
-        Rails.logger.info("update_date column: #{column.name}: options #{options.inspect}")
-        current_params[:value] = nil if current_params[:value].is_a?(String)
-        Rails.logger.info("update_date2 column: #{column.name}: #{current_params[:value].inspect}, class: #{current_params[:value].class}")
-        operator_options = active_scaffold_update_generic_operators(column)
-        operator_options.concat(ActiveScaffold::Actions::BatchUpdate::DateOperators.collect {|comp| [as_(comp.downcase.to_sym), comp]}) if active_scaffold_config.batch_update.process_mode == :update
-        options = options.merge(:show => ['PLUS', 'MINUS'].exclude?(current_params[:operator]))
-        tags = []
-        tags << select_tag("[record][#{column.name}][operator]",
-                options_for_select(operator_options, current_params[:operator]),
-                  :id => "#{options[:id]}_operator",
-                  :class => "text-input as_update_date_operator")
-        tags << active_scaffold_search_date_bridge_calendar_control(column, options, current_params[:value], 'value')
-        tags << active_scaffold_update_date_bridge_trend_tag(column, current_params, options)
-        tags.join("&nbsp;").html_safe
-      end
-
-      def active_scaffold_update_date_bridge_trend_tag(column, current_params, options)
-        active_scaffold_date_bridge_trend_tag(column, options,
-                                             {:name_prefix => '[record]',
-                                              :number_value => current_params[:number],
-                                              :unit_value => current_params[:unit],
-                                              :show => ['PLUS','MINUS'].include?(current_params[:operator])})
-      end
-    end
-  end
-end