active_scaffold 4.0.0.rc3 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ce97fc27fd6db228fc8c934c9559a9af750b0e19837c5eb30e6bb868fc108ef
-  data.tar.gz: d3568381187bb6ab2fb1245d5588063a09db42057704d0645abd5e04139f2cf2
+  metadata.gz: 18ae38a98f317aedf4c54ade9d6cf3090b9de8e7042104dbe8493b10f173603a
+  data.tar.gz: 63548a6d7f130d6771818f8387be0b548e74bcd1ed7dc856733b3f72c2a96fda
 SHA512:
-  metadata.gz: 445f89948894b2989ce7f20efb69ce649b1bbd045a124b7c0243e1ea8e4168922a54b901ee653a51fde2ad7b61b3014fa47521d62fa17120ab58671032a7afb4
-  data.tar.gz: ab62a6b00a0c403eeaa4bc94c346fa46871350d4b9a5ebcbe7d6d9c63c7e8d8b862f5083ba5c3045ff3ce533ea015e441f8adea9d35c7d6807d876a88202043f
+  metadata.gz: e1380da8c13475de3a825f828bb3d9109a52690f45d49cabd1be5bcbb138a2f36d985a676b9637e8a992a6ee551dc0f204b9103916e17845ee3990673219ab2c
+  data.tar.gz: 1861237d6327330311899eb90f0f4e8baee3cf81287f6336fb2c0634ab86073c41fa3838b7c2f923a11093e43ae07d074ac0a1a68bdc8df0ed1b23f91356bee2

data/CHANGELOG.rdoc

@@ -1,3 +1,7 @@
+- 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:
@@ -5,8 +9,12 @@
   - Action links can't be changed, added or removed, add all links and use ignore_method to control when they are displayed
   - Require using active_scaffold_config.override_columns to exclude or add columns
 - Thread safety enabled by default, can't be disabled, deprecate ActiveScaffold.threadsafe!
+- Support subgroups on field search
+
+= 3.7.11.1
+- Fix action link on association column named record
 
-= 3.7.11 (not released yet)
+= 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
 - Improve detection of member action links when list view is replaced with other structure, based on 'record' html class, instead of tags

data/README.md

@@ -61,6 +61,17 @@ Threadsafe
 
 Threadsafe is enabled always since 4.0, and it can't be disabled.  
 
+Breaking Changes
+----------------
+
+Changing column settings on a request has changed, it must use `active_scaffold_config.columns.override(:name)` at least the first time. After calling `columns.override(:name)`, calling it again or calling `columns[:name]` will return the overrided column. It also supports a block. See [Per Request Configuration](https://github.com/activescaffold/active_scaffold/wiki/Per-Request-Configuration) for examples and more comprehensive explanation.
+
+Changing columns for an action (e.g. add or exclude) on a request must use active_scaffold_config.actions.override_columns, the first time, or use assignment.
+
+If you have a `_form_association_record` partial view overrided, use `record` local variable instead of `form_association_record`.
+
+If you have code rendering `form_association_record` partial, the pass `record` local variable, or use `as: :record` if using render with collection key.
+
 Configuration
 -------------
 See Wiki for instructions on customising ActiveScaffold and to find the full API details.

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

@@ -535,6 +535,9 @@
         ActiveScaffold.sliders(container);
         ActiveScaffold.disable_optional_subforms(container);
         ActiveScaffold.update_floating_form_footer(); // check other forms too, state may change
+        if (container != document) {
+          jQuery('[data-rs-type]', container).each(function() { RecordSelect.from_attributes(jQuery(this)); });
+        }
       },
       setup_history_state: function() {
         if (!jQuery('.active-scaffold').length) return;
@@ -1298,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/app/views/active_scaffold_overrides/_field_search.html.erb

@@ -19,27 +19,9 @@
     <% 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| -%>
-      <li class="form-element <%= column.css_class unless column.css_class.is_a?(Proc) %>"><%= search_attribute(column, @record) %></li>
-    <% end -%>
-    <% unless hiddens.empty?  -%>
-      <li class="sub-section">
-      <% further_options_id = sub_section_id(sub_section: 'further_options') %>
-      <h5>
-        <%= as_(:optional_attributes) %>
-        <%= link_to_visibility_toggle(further_options_id, default_visible: false) %>
-      </h5>
-      <ol id ="<%= further_options_id %>" class="form" style="display:none;">
-      <% hiddens.each do |column| -%>
-        <li class="form-element <%= column.css_class unless column.css_class.is_a?(Proc) %>"><%= search_attribute(column, @record) %></li>
-      <% end -%>
-      </ol>
-      </li>
-  <% end -%>
-  </ol>
+
+  <%= render 'field_search_columns', columns: active_scaffold_config.field_search.columns %>
+
   <p class="form-footer">
     <%
       reset_attrs = {class: 'reset'}

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

@@ -0,0 +1,32 @@
+<ol class="form" <%= "id=#{subsection_id}" unless local_assigns[:subsection_id].nil? %> <%= 'style="display: none;"'.html_safe if columns.collapsed %>>
+  <% visibles, hiddens = visibles_and_hiddens(active_scaffold_config.field_search, columns) %>
+  <% visibles.each do |column| -%>
+    <% if column.respond_to? :each_column %>
+      <li class="sub-section <%= column.css_class unless column.css_class.is_a?(Proc) %>">
+        <%= render_subsection column, @record, nil, :field_search, partial: 'field_search_columns' %>
+      </li>
+    <% else %>
+      <li class="form-element <%= column.css_class unless column.css_class.is_a?(Proc) %>"><%= search_attribute(column, @record) %></li>
+    <% end %>
+  <% end -%>
+  <% unless hiddens.empty?  -%>
+    <li class="sub-section">
+    <% further_options_id = sub_section_id(sub_section: 'further_options') %>
+    <h5>
+      <%= as_(:optional_attributes) %>
+      <%= link_to_visibility_toggle(further_options_id, default_visible: false) %>
+    </h5>
+    <ol id="<%= further_options_id %>" class="form" style="display:none;">
+    <% hiddens.each do |column| -%>
+      <% if column.respond_to? :each_column %>
+        <li class="sub-section <%= column.css_class unless column.css_class.is_a?(Proc) %>">
+          <%= render_subsection column, @record, nil, :field_search, partial: 'field_search_columns' %>
+        </li>
+      <% else %>
+        <li class="form-element <%= column.css_class unless column.css_class.is_a?(Proc) %>"><%= search_attribute(column, @record) %></li>
+      <% end %>
+    <% end -%>
+    </ol>
+    </li>
+  <% end -%>
+</ol>

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

@@ -154,7 +154,7 @@ module ActiveScaffold
         {}
       end
 
-      def render_subsection(column, record, scope, form_action)
+      def render_subsection(column, record, scope, form_action, partial: 'form')
         subsection_id = sub_section_id(sub_section: column.label)
         locals = {columns: column, form_action: form_action, scope: scope}
         header = content_tag(:h5) do
@@ -165,11 +165,11 @@ module ActiveScaffold
           locals[:tabbed_by] = column.tabbed_by
           header << content_tag(:div, id: subsection_id) do
             active_scaffold_tabbed_by(column, record, scope, subsection_id) do |tab_value, tab_id|
-              render 'form', locals.merge(subsection_id: "#{subsection_id}-#{tab_id}", tab_id: tab_id, tab_value: tab_value)
+              render partial, locals.merge(subsection_id: "#{subsection_id}-#{tab_id}", tab_id: tab_id, tab_value: tab_value)
             end
           end
         else
-          header << render('form', locals.merge(subsection_id: subsection_id))
+          header << render(partial, locals.merge(subsection_id: subsection_id))
         end
       end
 
@@ -330,7 +330,7 @@ module ActiveScaffold
 
       def active_scaffold_input_singular_association(column, html_options, options = {}, ui_options: column.options)
         record = html_options.delete(:object)
-        associated = record.send(column.association.name)
+        associated = html_options.include?(:associated) ? html_options.delete(:associated) : record.send(column.association.name)
 
         select_options = sorted_association_options_find(column.association, nil, record)
         select_options.unshift(associated) unless associated.nil? || select_options.include?(associated)

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -396,11 +396,11 @@ module ActiveScaffold
         method if respond_to? method
       end
 
-      def visibles_and_hiddens(search_config)
+      def visibles_and_hiddens(search_config, columns = search_config.columns)
         visibles = []
         hiddens = []
-        search_config.columns.each_column(flatten: true) do |column|
-          next unless column.search_sql
+        columns.each_column do |column|
+          next unless column.respond_to?(:each_column) || column.search_sql
 
           if search_config.optional_columns.include?(column.name) && !searched_by?(column)
             hiddens << column
@@ -409,8 +409,8 @@ module ActiveScaffold
           end
         end
         if active_scaffold_group_column
-          columns = grouped_search? || search_config.optional_columns.empty? ? visibles : hiddens
-          columns << active_scaffold_group_column
+          group = grouped_search? || search_config.optional_columns.empty? ? visibles : hiddens
+          group << active_scaffold_group_column
         end
         [visibles, hiddens]
       end

data/lib/active_scaffold/version.rb

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

data/lib/active_scaffold.rb

@@ -51,9 +51,7 @@ module ActiveScaffold
   mattr_accessor :javascripts, instance_writer: false
   self.javascripts = []
 
-  def self.threadsafe!
-    ActiveSupport::Deprecation.warn 'Threadsafe is enabled always, no need to require it anymore'
-  end
+  def self.threadsafe!; end
 
   mattr_writer :jquery_ui_loaded, instance_writer: false
   def self.jquery_ui_included?
@@ -77,9 +75,6 @@ module ActiveScaffold
   end
 
   mattr_accessor :nested_subforms, instance_writer: false
-  def nested_subforms=(*)
-    ActiveSupport::Deprecation.warn 'Nested subforms are enabled by default already'
-  end
 
   def self.root
     "#{File.dirname(__FILE__)}/.."
@@ -88,6 +83,14 @@ module ActiveScaffold
   def self.defaults(&block)
     ActiveScaffold::Config::Core.configure(&block)
   end
+
+  def self.deprecator
+    @deprecator ||= ActiveSupport::Deprecation.new('4.1', 'ActiveScaffold')
+  end
+
+  class << self
+    ActiveScaffold.deprecator.deprecate_methods self, :nested_subforms= => 'is enabled always', threadsafe!: 'is enabled always'
+  end
 end
 require 'active_scaffold/engine'
 require 'ice_nine'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 4.0.0.rc3
+  version: 4.0.1
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-08 00:00:00.000000000 Z
+date: 2025-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,6 +114,7 @@ files:
 - app/views/active_scaffold_overrides/_create_form.html.erb
 - app/views/active_scaffold_overrides/_create_form_on_list.html.erb
 - app/views/active_scaffold_overrides/_field_search.html.erb
+- app/views/active_scaffold_overrides/_field_search_columns.html.erb
 - app/views/active_scaffold_overrides/_form.html.erb
 - app/views/active_scaffold_overrides/_form_association.html.erb
 - app/views/active_scaffold_overrides/_form_association_footer.html.erb