active_scaffold 4.0.0 → 4.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cadefffe75f1a7bdf8afba8418f0ffff986086b93a5045b4680b06c4ffe47c1a
-  data.tar.gz: ca800128c2c114e3acd598c3ec35172cff9b271171b1dd6a95c098ba1114ae94
+  metadata.gz: 1411d7317097c53427854d287da2fe123d38498ab8bbff98308798c6da5ffc9b
+  data.tar.gz: 46a02c5b035126602809edc855e0b6edb71f532c5bd66e91a5347a596895743e
 SHA512:
-  metadata.gz: c26cfb49d8896404c8702bf908740e2e1a19f3b18478411bd1244f3a7b4f940dacf89b2cbd260e7ea1ab90afc4b262a637f3260f784bd5b58f8fe7fd0f9b9571
-  data.tar.gz: 6327f74958e882da485fffefaa098845016ccf83d4dc19b46d525e6d6d7f6017e57ec0ea612c39431f54c5f925615dd3c279b453126998033875ffd81da8762c
+  metadata.gz: 250738344e423f2a7509c299f7fcc813a7d36b557d245b3f983ff6bcf6c122729482f2b469625e78d2d9d4252a6d74976ebce6b8cd532ff7ca3633f391171cc3
+  data.tar.gz: 3bda9ffc65eeda39907a9a216ea7f6f8af6ddc799182f7a4d867a2790f9c53d5ba7ec0297326eb1bb19974734e49926bc09ac5561114030c226b986d87cd41f6

data/CHANGELOG.rdoc

@@ -1,3 +1,12 @@
+= 4.0.2
+- Fix using update_columns in field search with search UI submitting a hash, such as date fields
+- Support disabling update_columsns on field_search
+
+= 4.0.1
+- Add :text_editor show_ui, to avoid escaping html code
+- Fix action link on association column named record
+
+= 4.0.0
 - Add tabbed_by to group of columns in forms. The columns in the group must be collection associations, with a common column or association, used to partition them in different tabs.
 - Fix tableless in rails >= 7.1
 - Stop using cow_proxy for thread safety:
@@ -7,6 +16,13 @@
 - Thread safety enabled by default, can't be disabled, deprecate ActiveScaffold.threadsafe!
 - Support subgroups on field search
 
+= 3.7.12
+- Fix using update_columns in field search with search UI submitting a hash, such as date fields
+- Support disabling update_columsns on field_search
+
+= 3.7.11.1
+- Fix action link on association column named record
+
 = 3.7.11
 - Add partial list_messages_content to reduce code duplication, and better support replacing list view with other way to render records
 - Support selector for records body in create_record_row JS method, better support replacing list view with other way to render records

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

@@ -1301,8 +1301,8 @@
         if (element.length > 0) {
           element.data(); // $ 1.4.2 workaround
           if (typeof(element.data('action_link')) === 'undefined' && !element.hasClass('as_adapter')) {
-            var parent = element.closest('.record');
-            if (parent.length === 0) parent = element.closest('.actions');
+            var parent = element.parent().closest('.record');
+            if (parent.length === 0) parent = element.parent().closest('.actions');
             if (parent.is('.record')) {
               // record action
               var target = parent.find('a.as_action');

data/lib/active_scaffold/actions/core.rb

@@ -115,7 +115,11 @@ module ActiveScaffold::Actions
       copy_attributes(saved_record, record) if saved_record
       apply_constraints_to_record(record) unless scope
       create_association_with_parent record, check_match: true if nested?
-      update_record_from_params(record, columns, attributes || {}, true)
+      if @form_action == :field_search
+        update_columns_from_params(record, columns, attributes || {}, :read, avoid_changes: true, search_attributes: true)
+      else
+        update_record_from_params(record, columns, attributes || {}, true)
+      end
     end
 
     def updated_record_with_column(column, value, scope)

data/lib/active_scaffold/actions/subform.rb

@@ -14,14 +14,13 @@ module ActiveScaffold::Actions
       # don't apply if scope, subform inside subform, because constraints won't apply to parent_record
       apply_constraints_to_record parent_record unless @scope
       create_association_with_parent parent_record, check_match: true if nested?
+      cache_generated_id(parent_record, params[:generated_id])
       parent_record
     end
 
     def do_edit_associated
       @scope = params[:scope]
       @parent_record = params[:id].nil? ? new_parent_record : find_if_allowed(params[:id], :update)
-
-      cache_generated_id(@parent_record, params[:generated_id]) if @parent_record.new_record?
       @column = active_scaffold_config.columns[params[:child_association]]
 
       @record = (find_associated_record if params[:associated_id]) ||

data/lib/active_scaffold/attribute_params.rb

@@ -55,13 +55,17 @@ module ActiveScaffold
     #
     # This is a secure way to apply params to a record, because it's based on a loop over the columns
     # set. The columns set will not yield unauthorized columns, and it will not yield unregistered columns.
-    def update_record_from_params(parent_record, columns, attributes, avoid_changes = false)
+    def update_record_from_params(parent_record, columns, attributes, avoid_changes = false, search_attributes: false)
       crud_type = parent_record.new_record? ? :create : :update
       return parent_record unless parent_record.authorized_for?(crud_type: crud_type)
 
-      multi_parameter_attrs = multi_parameter_attributes(attributes)
       assign_locking_column(parent_record, attributes)
+      update_columns_from_params(parent_record, columns, attributes, crud_type, avoid_changes: avoid_changes, search_attributes: search_attributes)
+      parent_record
+    end
 
+    def update_columns_from_params(parent_record, columns, attributes, crud_type, avoid_changes: false, search_attributes: false)
+      multi_parameter_attrs = multi_parameter_attributes(attributes)
       columns.each_column(for: parent_record, crud_type: crud_type, flatten: true) do |column|
         # Set any passthrough parameters that may be associated with this column (ie, file column "keep" and "temp" attributes)
         assign_column_params(parent_record, column, attributes)
@@ -69,16 +73,16 @@ module ActiveScaffold
         if multi_parameter_attrs.key? column.name.to_s
           parent_record.send(:assign_multiparameter_attributes, multi_parameter_attrs[column.name.to_s])
         elsif attributes.key? column.name
+          next if search_attributes && params_hash?(attributes[column.name])
+
           update_column_from_params(parent_record, column, attributes[column.name], avoid_changes)
         end
       rescue StandardError => e
         message = "on the ActiveScaffold column = :#{column.name} for #{parent_record.inspect} " \
                   "(value from params #{attributes[column.name].inspect})"
         Rails.logger.error "#{e.class.name}: #{e.message} -- #{message}"
-        raise
+        raise e.class, "#{e.message} -- #{message}"
       end
-
-      parent_record
     end
 
     def assign_column_params(parent_record, column, attributes)

data/lib/active_scaffold/bridges/tiny_mce/helpers.rb

@@ -36,5 +36,14 @@ class ActiveScaffold::Bridges::TinyMce
         base.class_eval { alias_method :active_scaffold_search_text_editor, :active_scaffold_search_text }
       end
     end
+
+    module ShowColumnHelpers
+      def active_scaffold_show_text_editor(record, column, ui_options: column.options)
+        record.send(column.name).html_safe # rubocop:disable Rails/OutputSafety
+      end
+
+      # Alias, in case the column uses :tinymce form_ui
+      alias active_scaffold_show_tinymce active_scaffold_show_text_editor
+    end
   end
 end

data/lib/active_scaffold/config/field_search.rb

@@ -37,6 +37,9 @@ module ActiveScaffold::Config
 
     cattr_accessor :reset_form, instance_accessor: false
 
+    # whether refresh columns defined in update_columns when a column is changed, as create and update forms do
+    cattr_accessor :update_columns
+
     # instance-level configuration
     # ----------------------------
 
@@ -85,8 +88,11 @@ module ActiveScaffold::Config
 
     attr_accessor :reset_form
 
+    # whether refresh columns defined in update_columns when a column is changed, as create and update forms do
+    attr_accessor :update_columns
+
     UserSettings.class_eval do
-      user_attr :optional_columns, :group_options, :grouped_columns, :human_conditions, :floating_footer
+      user_attr :optional_columns, :group_options, :grouped_columns, :human_conditions, :floating_footer, :update_columns
     end
   end
 end

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -6,8 +6,10 @@ module ActiveScaffold
       # It does not do any rendering. It only decides which method is responsible for rendering.
       def active_scaffold_search_for(column, options = nil)
         options ||= active_scaffold_search_options(column)
-        search_columns = active_scaffold_config.field_search.columns.visible_columns_names
-        options = update_columns_options(column, nil, options, form_columns: search_columns, url_params: {form_action: :field_search})
+        if active_scaffold_config.field_search.update_columns
+          search_columns = active_scaffold_config.field_search.columns.visible_columns_names
+          options = update_columns_options(column, nil, options, form_columns: search_columns, url_params: {form_action: :field_search})
+        end
         record = options[:object]
         if column.delegated_association
           record = record.send(column.delegated_association.name) || column.active_record_class.new

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 4
     MINOR = 0
-    PATCH = 0
+    PATCH = 2
     FIX = nil
 
     STRING = [MAJOR, MINOR, PATCH, FIX].compact.join('.')

metadata

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