active_scaffold 3.7.2 → 3.7.3

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

@@ -21,8 +21,10 @@
     jQuery(element).sortable(jQuery.extend(options, {connectWith: '#'+list_selected.attr('id')}));
     jQuery(list_selected).sortable(jQuery.extend(options, {connectWith: '#'+element.attr('id')}));
     return element;
-  };
-  jQuery.fn.draggableLists = function() {
-    this.each(function() { enableDraggableLists(jQuery(this)); });
-  };
+  }
+  if (typeof(jQuery.fn.sortable) !== 'undefined') {
+    jQuery.fn.draggableLists = function() {
+      this.each(function() { enableDraggableLists(jQuery(this)); });
+    };
+  }
 })();

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

@@ -11,10 +11,10 @@
     var global_settings = ActiveScaffold.config.tiny_mce_settings || {};
     var local_settings = jQuery(this).data('tinymce');
     var settings = {};
-    for (key in global_settings) {
+    for (let key in global_settings) {
       settings[key] = global_settings[key];
     }
-    for (key in local_settings) {
+    for (let key in local_settings) {
       settings[key] = local_settings[key];
     }
     var id = jQuery(this).attr('id');

data/app/assets/stylesheets/active_scaffold_jquery_ui.css.erb

@@ -1,11 +1,10 @@
 <% if Jquery::Rails.const_defined? 'JQUERY_UI_VERSION' %>
-<% require_asset "jquery-ui" %>
-<% require_asset "jquery-ui-theme" %>
+  <% require_asset "jquery-ui" %>
 <% elsif Jquery.const_defined? 'Ui' %>
-<% if Jquery::Ui::Rails::VERSION < '5.0.0' %>
-<% require_asset "jquery.ui.datepicker" %>
-<% else %>
-<% require_asset "jquery-ui/datepicker" %>
-<% end %>
-<% require_asset "jquery-ui-theme" %>
+  <% if Jquery::Ui::Rails::VERSION < '5.0.0' %>
+    <% require_asset "jquery.ui.datepicker" %>
+  <% else %>
+    <% require_asset "jquery-ui/datepicker" %>
+  <% end %>
 <% end %>
+<% require_asset "jquery-ui-theme" if ActiveScaffold.jquery_ui_included? %>

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

@@ -41,8 +41,17 @@
   <% end -%>
   </ol>
   <p class="form-footer">
+    <%
+      reset_attrs = {class: 'reset'}
+      if active_scaffold_config.field_search.reset_form
+        reset_attrs[:data] = {reset: true}
+      else
+        reset_attrs[:class] << ' as_cancel'
+        reset_attrs.merge! remote: true, data: {refresh: true}
+      end
+    %>
     <%= submit_tag as_(submit_text), :class => "submit" %>
-    <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), :class => 'as_cancel reset', :remote => true, :data => {:refresh => true} unless local_assigns[:skip_reset] %>
+    <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), reset_attrs unless local_assigns[:skip_reset] %>
     <%= loading_indicator_tag(:action => :search) %>
   </p>
 </form>

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

@@ -21,6 +21,14 @@
   <% end -%>
   <%= search_field_tag :search, (search_params if search_params.is_a? String), :class => 'text-input', :id => search_input_id, :size => 50, :autocomplete => :off, :placeholder => as_(live_search ? :live_search : :search_terms) %>
   <%= submit_tag as_(submit_text), :class => "submit", :style => ('display:none;' if live_search) %>
-  <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), :class => 'as_cancel reset', :remote => true, :data => {:refresh => true} unless local_assigns[:skip_reset] %>
+  <%
+    reset_attrs = {class: 'as_cancel reset'}
+    if active_scaffold_config.field_search.reset_form
+      reset_attrs[:data] = {reset: true}
+    else
+      reset_attrs.merge! remote: true, data: {refresh: true}
+    end
+  %>
+  <%= link_to as_(:reset), url_for(url_options.merge(:search => '')), reset_attrs unless local_assigns[:skip_reset] %>
   <%= loading_indicator_tag(:action => :search) %>
 <% end %>

data/lib/active_scaffold/bridges/date_picker.rb

@@ -10,7 +10,7 @@ module ActiveScaffold::Bridges
     end
 
     def self.jquery_ui_included?
-      Jquery::Rails.const_defined?('JQUERY_UI_VERSION') || Jquery.const_defined?('Ui') if Object.const_defined?('Jquery')
+      ActiveScaffold.jquery_ui_included?
     end
     mattr_accessor :default_ui
     @@default_ui = true

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

@@ -27,7 +27,7 @@ class ActiveScaffold::Bridges::RecordSelect
       def active_scaffold_record_select(record, column, options, value, multiple, ui_options: column.options)
         unless column.association
           raise ArgumentError, "record_select can only work against associations (and #{column.name} is not). "\
-          'A common mistake is to specify the foreign key field (like :user_id), instead of the association (:user).'
+            'A common mistake is to specify the foreign key field (like :user_id), instead of the association (:user).'
         end
         klass = column.association.klass(record)
         return content_tag :span, '', :class => options[:class] unless klass
@@ -68,13 +68,13 @@ class ActiveScaffold::Bridges::RecordSelect
     module SearchColumnHelpers
       def active_scaffold_search_record_select(column, options, ui_options: column.options)
         value = field_search_record_select_value(column, options[:value], ui_options: ui_options)
-        active_scaffold_record_select(options[:object], column, options, value, ui_options[:multiple], ui_options: ui_options)
+        active_scaffold_record_select(options[:object], column, options.except(:value), value, ui_options[:multiple], ui_options: ui_options)
       end
 
       def field_search_record_select_value(column, value, ui_options: column.options)
         return if value.blank?
         if ui_options[:multiple]
-          column.association.klass.find value.collect!(&:to_i)
+          column.association.klass.find value.select(&:present?).collect!(&:to_i)
         else
           column.association.klass.find(value.to_i)
         end

data/lib/active_scaffold/config/field_search.rb

@@ -8,6 +8,7 @@ module ActiveScaffold::Config
       @text_search = self.class.text_search
       @human_conditions = self.class.human_conditions
       @floating_footer = self.class.floating_footer
+      @reset_form = self.class.reset_form
     end
 
     # global level configuration
@@ -34,6 +35,8 @@ module ActiveScaffold::Config
     class_attribute :floating_footer, instance_accessor: false
     @@floating_footer = false
 
+    cattr_accessor :reset_form, instance_accessor: false
+
     # instance-level configuration
     # ----------------------------
 
@@ -79,6 +82,8 @@ module ActiveScaffold::Config
     # whether footer should float when form is too long to fit in the screen, so footer is always available while scrolling
     attr_accessor :floating_footer
 
+    attr_accessor :reset_form
+
     UserSettings.class_eval do
       user_attr :optional_columns, :group_options, :grouped_columns, :human_conditions, :floating_footer
     end

data/lib/active_scaffold/config/search.rb

@@ -7,6 +7,7 @@ module ActiveScaffold::Config
       @text_search = self.class.text_search
       @live = self.class.live?
       @split_terms = self.class.split_terms
+      @reset_form = self.class.reset_form
     end
 
     # global level configuration
@@ -33,6 +34,8 @@ module ActiveScaffold::Config
     cattr_accessor :split_terms, instance_accessor: false
     @@split_terms = ' '
 
+    cattr_accessor :reset_form, instance_accessor: false
+
     # instance-level configuration
     # ----------------------------
 
@@ -56,6 +59,8 @@ module ActiveScaffold::Config
 
     attr_accessor :split_terms
 
+    attr_accessor :reset_form
+
     # the ActionLink for this action
     attr_accessor :link
 

data/lib/active_scaffold/finder.rb

@@ -29,7 +29,12 @@ module ActiveScaffold
       def type_casted_tokens(tokens, columns, like_pattern)
         tokens.map do |value|
           columns.each_with_object({}) do |column, column_tokens|
-            column_tokens[column.name] = column.text? ? like_pattern.sub('?', value) : ActiveScaffold::Core.column_type_cast(value, column.column)
+            column_tokens[column.name] =
+              if column.text?
+                like_pattern.sub('?', column.active_record? ? column.active_record_class.sanitize_sql_like(value) : value)
+              else
+                ActiveScaffold::Core.column_type_cast(value, column.column)
+              end
           end
         end
       end
@@ -165,6 +170,7 @@ module ActiveScaffold
           ['%<search_sql>s in (?)', values] if values.present?
         else
           if column.text?
+            value = column.active_record? ? column.active_record_class.sanitize_sql_like(value) : value
             ["%<search_sql>s #{ActiveScaffold::Finder.like_operator} ?", like_pattern.sub('?', value)]
           else
             ['%<search_sql>s = ?', ActiveScaffold::Core.column_type_cast(value, column.column)]
@@ -189,6 +195,7 @@ module ActiveScaffold
       def condition_for_range(column, value, like_pattern = nil)
         if !value.is_a?(Hash)
           if column.text?
+            value = column.active_record? ? column.active_record_class.sanitize_sql_like(value) : value
             ["%<search_sql>s #{ActiveScaffold::Finder.like_operator} ?", like_pattern.sub('?', value)]
           else
             ['%<search_sql>s = ?', ActiveScaffold::Core.column_type_cast(value, column.column)]
@@ -198,9 +205,10 @@ module ActiveScaffold
         elsif value[:from].blank?
           nil
         elsif ActiveScaffold::Finder::STRING_COMPARATORS.values.include?(value[:opt])
+          text = column.active_record? ? column.active_record_class.sanitize_sql_like(value[:from]) : value[:from]
           [
             "%<search_sql>s #{'NOT ' if value[:opt].start_with?('not_')}#{ActiveScaffold::Finder.like_operator} ?",
-            value[:opt].sub('not_', '').sub('?', value[:from])
+            value[:opt].sub('not_', '').sub('?', text)
           ]
         elsif value[:opt] == 'BETWEEN'
           ['(%<search_sql>s BETWEEN ? AND ?)', value[:from], value[:to]]
@@ -441,7 +449,8 @@ module ActiveScaffold
 
       def condition_for_record_select_type(column, value, like_pattern = nil)
         if value.is_a?(Array)
-          ['%<search_sql>s IN (?)', value]
+          value = value.select(&:present?)
+          ['%<search_sql>s IN (?)', value] if value.present?
         else
           ['%<search_sql>s = ?', value]
         end
@@ -609,7 +618,8 @@ module ActiveScaffold
       options[:page] ||= 1
 
       find_options = finder_options(options)
-      query = beginning_of_chain.where(nil) # where(nil) is needed because we need a relation
+      query = beginning_of_chain
+      query = query.where(nil) if active_scaffold_config.active_record? # where(nil) is needed because we need a relation
 
       # NOTE: we must use :include in the count query, because some conditions may reference other tables
       if options[:pagination] && options[:pagination] != :infinite

data/lib/active_scaffold/helpers/id_helpers.rb

@@ -15,7 +15,7 @@ module ActiveScaffold
       end
 
       def nested_parent_id
-        nested_parent_record.id
+        clean_id nested_parent_record.id.to_s
       end
 
       def nested_id(controller = nil)

data/lib/active_scaffold/version.rb

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

data/lib/active_scaffold.rb

@@ -66,6 +66,12 @@ module ActiveScaffold
       end
   end
 
+  mattr_writer :jquery_ui_loaded, instance_writer: false
+  def self.jquery_ui_included?
+    return true if @@jquery_ui_loaded
+    Jquery::Rails.const_defined?('JQUERY_UI_VERSION') || Jquery.const_defined?('Ui') if Object.const_defined?('Jquery')
+  end
+
   mattr_writer :js_config, instance_writer: false
   def self.js_config
     @@js_config ||= {:scroll_on_close => :checkInViewport}

data/vendor/assets/javascripts/jquery.ba-throttle-debounce.js

@@ -60,7 +60,8 @@
 // the `Cowboy` namespace. Usage will be exactly the same, but instead of
 // $.method() or jQuery.method(), you'll need to use Cowboy.method().
 
-(function(window,undefined){
+(function() {
+var jqueryThrottleDebounceInit = function($, undefined) {
   '$:nomunge'; // Used by YUI compressor.
   
   // Since jQuery really isn't required for this plugin, use `jQuery` as the
@@ -248,5 +249,11 @@
       ? jq_throttle( delay, at_begin, false )
       : jq_throttle( delay, callback, at_begin !== false );
   };
-  
-})(this);
+};
+
+if (window.jQuery) {
+  jqueryThrottleDebounceInit(jQuery);
+} else if (typeof exports === 'object' && typeof module === 'object') {
+  module.exports = jqueryThrottleDebounceInit;
+}
+})();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_scaffold
 version: !ruby/object:Gem::Version
-  version: 3.7.2
+  version: 3.7.3
 platform: ruby
 authors:
 - Many, see README
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-07 00:00:00.000000000 Z
+date: 2024-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails