active_scaffold 3.6.8 → 3.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d63c8ce5c055421403fdf35bce2cc09fa4797ad8ccf282fd0ab96b80a254b56
-  data.tar.gz: af6eea7aa4e45b55bfafcdc1c2cedbd2e3880bf71af800fd2720a291fde329a8
+  metadata.gz: 97d6ca8d1bfe05ad56e32d006caecb46e96ce220023490c816942f18a77c57d2
+  data.tar.gz: 605328d07d556bad95298f038cb33fb7a91903200b87974d1c36747ba9c2f8bc
 SHA512:
-  metadata.gz: edd5caa3ba54351a67da98599a5bf684eb1e6cdc573c951a5318d25cbb6f36fceabfb963f0a6e4c64a21320c75aecfcefb07c6f4f049fd4f49a585ff3e74c09c
-  data.tar.gz: 7a1a1ed5fb94ded3584468ccec6ec7321d781f0ae90efd767a6723c8ff5cd29b11a5f67620599e32a44becd5c6ec322835056c5f1baf1430802c132db16f42c9
+  metadata.gz: 305ce148588f05c5a00858ef82e235575434c2760e9d2abf99f6d3be213b875195a81921da1f6590dceab7010d64646245000333982a974c58656bce99364b96
+  data.tar.gz: 350c358fdf5a3187170ab73ac8ccb831662e3edc041cf6adce85db3023888e6c2336a2141a6f6ff79be1db952fd1d5c46d9acb12026d248b433443690d92137a

data/CHANGELOG.rdoc

@@ -1,3 +1,18 @@
+= 3.6.11
+- Fix inplace edit cloning with jquery >= 1.9, when more than one child is cloned
+- Support inplace edit cloning for :radio form_ui
+- Add records parameter to cache_columns_count and related methods (count_query_for_column, mongoid_count_for_column)
+- Fix required attribute when validator uses :on option, so on: :update only set required on update form, and :create only set required on create form
+
+= 3.6.10
+- Don't add numerical constraints based on conditional validation
+- Fix typo in cache key for numerical constraints
+- Fix duplicated params in search form, e.g. embedded constraints
+
+= 3.6.9
+- Support depend on .rb or .json locale files for date picker bridge
+- Fix search with dates entered with timezone in datepicker
+
 = 3.6.8
 - Add depend_on available translations in app to data picker bridge JS
 - Fix live search with rails-ujs

data/app/assets/javascripts/jquery/date_picker_bridge.js.erb

@@ -1,5 +1,5 @@
 <%# encoding: utf-8 %>
-<% I18n.available_locales.map { |locale| Rails.root.join("config/locales/#{locale}.yml") }.select(&:exist?).each { |path| depend_on path.to_s } %>
+<% I18n.available_locales.each { |locale| Dir[Rails.root.join("config/locales/#{locale}.*")].each { |path| depend_on path } } %>
 <%= ActiveScaffold::Bridges[:date_picker].localization %>
 Object.getPrototypeOf(jQuery.datepicker)._attachDatepicker_without_inlineSettings = Object.getPrototypeOf(jQuery.datepicker)._attachDatepicker;
 jQuery.extend(Object.getPrototypeOf(jQuery.datepicker), {

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

@@ -317,7 +317,6 @@ $.extend(InlineEditor.prototype, {
 		if (editorNode.data('id')) editorNode.attr('id', editorNode.data('id') + this.settings.clone_id_suffix);
 		editorNode.attr('name', 'inplace_value');
 		editorNode.addClass('editor_field');
-		this.setValue(editorNode, this.originalValue);
 		clonedNodes = editorNode;
 
 		if (patternNodes.additionalNodes) {
@@ -326,9 +325,10 @@ $.extend(InlineEditor.prototype, {
 				if (patternNode.data('id')) {
 					patternNode.attr('id', patternNode.data('id') + this.settings.clone_id_suffix);
 				}
-				clonedNodes = clonedNodes.after(patternNode);
+				clonedNodes.push(patternNode[0]);
 			});
 		}
+		this.setValue(clonedNodes, this.originalValue);
 		return clonedNodes;
 	},
 
@@ -349,23 +349,37 @@ $.extend(InlineEditor.prototype, {
 		return nodes;
 	},
 	
-	setValue: function(editField, textValue) {
-		var function_name = 'setValueFor' + editField.get(0).nodeName.toLowerCase();
+	setValue: function(editFields, textValue) {
+		var editField = editFields.find(':input').addBack(':input'),
+			type = editField.get(0).nodeName.toLowerCase();
+		if (type === 'input') type = editField.attr('type').toLowerCase();
+		var function_name = 'setValueFor' + type;
 		if (typeof(this[function_name]) == 'function') {
-			this[function_name](editField, textValue);
+			this[function_name](editFields, textValue);
 		} else {
 			editField.val(textValue);
 		}
 	},
 
-	setValueForselect: function(editField, textValue) {
-		var option_value = editField.children("option:contains('" + textValue + "')").val();
+	setValueForselect: function(editFields, textValue) {
+		var editField = editFields.find('select').addBack('select').first(),
+			option_value = editField.children("option:contains('" + textValue + "')").val();
 
 		if (typeof(option_value) !== 'undefined') {
 			editField.val(option_value);
 		}
 	},
 
+	setValueForradio: function(editFields, textValue) {
+		var editField = editFields.find('input[type=radio]').addBack('input[type=radio]').filter(function() {
+			var contains = ':contains("' + textValue + '")';
+			return editFields.find('label[for="' + $(this).attr('id') + '"]' + contains).length ||
+				$(this).closest('label' + contains).length;
+		}).first();
+
+		if (editField.length) editField.prop('checked', true);
+	},
+
 	inputNameAndClass: function() {
 		return ' name="inplace_value" class="inplace_field" ';
 	},

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

@@ -24,7 +24,7 @@
     <%= render_column(column, @record, renders_as, scope) %>
   <% end %>
   <% else -%>
-  <li class="form-element <%= 'required' if column.required? %> <%= column.form_ui %> <%= column_css_class %>">
+  <li class="form-element <%= 'required' if column.required?(action_for_validation?(@record)) %> <%= column.form_ui %> <%= column_css_class %>">
     <%= render_column(column, @record, renders_as, scope, !authorized) %>
   </li>
   <% end -%>

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

@@ -4,7 +4,7 @@ if column.show_blank_record?(associated)
   show_blank_record = build_associated(column.association, parent_record)
 end
 disable_required_for_new = @disable_required_for_new
-@disable_required_for_new = !!show_blank_record unless (column.association.singular? && column.required?)
+@disable_required_for_new = !!show_blank_record unless (column.association.singular? && column.required?(action_for_validation?(parent_record)))
 subform_div_id = "#{sub_form_id(:association => column.name, :id => parent_record.id || generated_id(parent_record) || 99999999999)}-div"
 
 # render footer before rendering associated records, fixes create new on self-associations

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

@@ -58,7 +58,7 @@
     end
 
     col_class = default_col_class.clone
-    col_class << 'required' if column.required?
+    col_class << 'required' if column.required?(action_for_validation?(record))
     col_class << column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc)
     col_class << 'hidden' if column_renders_as(column) == :hidden
   -%>
@@ -88,7 +88,7 @@
       <% columns_group.each_column(for: record.class, crud_type: :read, flatten: true) do |col| %>
         <%
           col_class = default_col_class.clone
-          col_class << 'required' if col.required?
+          col_class << 'required' if col.required?(action_for_validation?(record))
           col_class << col.css_class unless col.css_class.nil? || col.css_class.is_a?(Proc)
           col_class << 'hidden' if column_renders_as(col) == :hidden
         %>

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

@@ -14,7 +14,7 @@
   hidden_params = url_options.except(:controller, :action, :id, :search).to_query.split(Rack::Utils::DEFAULT_SEP)
 -%>
 
-<%= form_tag url_options, options do %>
+<%= form_tag url_options.slice(:controller, :action, :id, :search), options do %>
   <% hidden_params.each do |pair| -%>
     <% key, value = pair.split('=', 2).map { |str| Rack::Utils.unescape(str) } -%>
     <%= hidden_field_tag(key, value) %>

data/lib/active_scaffold/actions/list.rb

@@ -125,7 +125,7 @@ module ActiveScaffold::Actions
       @remove_id_from_list_links = params[:id].blank?
       @page = current_page
       @records = @page.items
-      cache_column_counts
+      cache_column_counts @records
     end
 
     def columns_to_cache_counts
@@ -136,12 +136,12 @@ module ActiveScaffold::Actions
       end
     end
 
-    def cache_column_counts
+    def cache_column_counts(records)
       @counts = columns_to_cache_counts.each_with_object({}) do |column, counts|
         if ActiveScaffold::OrmChecks.active_record?(column.association.klass)
-          counts[column.name] = count_query_for_column(column).count
+          counts[column.name] = count_query_for_column(column, records).count
         elsif ActiveScaffold::OrmChecks.mongoid?(column.association.klass)
-          counts[column.name] = mongoid_count_for_column(column)
+          counts[column.name] = mongoid_count_for_column(column, records)
         end
       end
     end
@@ -151,17 +151,17 @@ module ActiveScaffold::Actions
         (!column.association.as || column.association.reverse_association)
     end
 
-    def count_query_for_column(column)
+    def count_query_for_column(column, records)
       if count_on_association_class?(column)
-        count_query_on_association_class(column)
+        count_query_on_association_class(column, records)
       else
-        count_query_with_join(column)
+        count_query_with_join(column, records)
       end
     end
 
-    def count_query_on_association_class(column)
+    def count_query_on_association_class(column, records)
       key = column.association.primary_key || :id
-      query = column.association.klass.where(column.association.foreign_key => @records.map(&key.to_sym))
+      query = column.association.klass.where(column.association.foreign_key => records.map(&key.to_sym))
       if column.association.as
         query.where!(column.association.reverse_association.foreign_type => active_scaffold_config.model.name)
       end
@@ -171,17 +171,17 @@ module ActiveScaffold::Actions
       query.group(column.association.foreign_key)
     end
 
-    def count_query_with_join(column)
+    def count_query_with_join(column, records)
       klass = column.association.klass
-      query = active_scaffold_config.model.where(active_scaffold_config.primary_key => @records.map(&:id))
+      query = active_scaffold_config.model.where(active_scaffold_config.primary_key => records.map(&:id))
                                     .joins(column.name).group(active_scaffold_config.primary_key)
                                     .select("#{klass.quoted_table_name}.#{klass.quoted_primary_key}")
       query = query.uniq if column.association.scope && klass.instance_exec(&column.association.scope).values[:distinct]
       query
     end
 
-    def mongoid_count_for_column(column)
-      matches = {column.association.foreign_key => {'$in': @records.map(&:id)}}
+    def mongoid_count_for_column(column, records)
+      matches = {column.association.foreign_key => {'$in': records.map(&:id)}}
       if column.association.as
         matches[column.association.reverse_association.foreign_type] = {'$eq': active_scaffold_config.model.name}
       end

data/lib/active_scaffold/actions/update.rb

@@ -69,7 +69,7 @@ module ActiveScaffold::Actions
       @updated_record = @record
       # get_row so associations are cached like in list action
       # if record doesn't fullfil current conditions remove it from list
-      @record = get_row
+      get_row
     rescue ActiveRecord::RecordNotFound
       nil
     end

data/lib/active_scaffold/bridges/shared/date_bridge.rb

@@ -122,9 +122,9 @@ module ActiveScaffold
               if column.search_sql.is_a? Proc
                 column.search_sql.call(from_value, to_value, operator)
               elsif operator.nil?
-                ['%<search_sql>s BETWEEN ? AND ?', from_value.to_s(:db), to_value.to_s(:db)] unless from_value.nil? || to_value.nil?
+                ['%<search_sql>s BETWEEN ? AND ?', from_value, to_value] unless from_value.nil? || to_value.nil?
               else
-                ["%<search_sql>s #{value['opt']} ?", from_value.to_s(:db)] unless from_value.nil?
+                ["%<search_sql>s #{value['opt']} ?", from_value] unless from_value.nil?
               end
             end
 

data/lib/active_scaffold/data_structures/column.rb

@@ -66,8 +66,12 @@ module ActiveScaffold::DataStructures
     # whether the field is required or not. used on the form for visually indicating the fact to the user.
     # TODO: move into predicate
     attr_writer :required
-    def required?
-      @required
+    def required?(action = nil)
+      if action && @required
+        @required == true || @required.include?(action)
+      else
+        @required
+      end
     end
 
     attr_reader :update_columns
@@ -353,9 +357,11 @@ module ActiveScaffold::DataStructures
 
       # default all the configurable variables
       self.css_class = ''
-      self.required = active_record_class.validators_on(name).any? do |val|
-        validator_force_required?(val)
-      end
+      validators_force_require_on = active_record_class.validators_on(name)
+                                                       .map { |val| validator_force_required?(val) }
+                                                       .select(&:present?)
+      self.required = validators_force_require_on.any? { |opt| opt == true } ||
+                      validators_force_require_on.reject { |opt| opt == true }.flatten
       self.sort = true
       self.search_sql = true
 
@@ -436,13 +442,18 @@ module ActiveScaffold::DataStructures
       return false if val.options[:if] || val.options[:unless]
       case val
       when ActiveModel::Validations::PresenceValidator
-        true
+        validator_required_on(val)
       when ActiveModel::Validations::InclusionValidator
-        !val.options[:allow_nil] && !val.options[:allow_blank] &&
-          !inclusion_validator_for_checkbox?(val)
+        if !val.options[:allow_nil] && !val.options[:allow_blank] && !inclusion_validator_for_checkbox?(val)
+          validator_required_on(val)
+        end
       end
     end
 
+    def validator_required_on(val)
+      val.options[:on] ? Array(val.options[:on]) : true
+    end
+
     def inclusion_validator_for_checkbox?(val)
       @form_ui == :checkbox &&
         [[true, false], [false, true]].include?(val.options[:with] || val.options[:within] || val.options[:in])

data/lib/active_scaffold/finder.rb

@@ -319,11 +319,11 @@ module ActiveScaffold
         if from_value.nil? && to_value.nil?
           nil
         elsif !from_value
-          ['%<search_sql>s <= ?', to_value.to_s(:db)]
+          ['%<search_sql>s <= ?', to_value]
         elsif !to_value
-          ['%<search_sql>s >= ?', from_value.to_s(:db)]
+          ['%<search_sql>s >= ?', from_value]
         else
-          ['%<search_sql>s BETWEEN ? AND ?', from_value.to_s(:db), to_value.to_s(:db)]
+          ['%<search_sql>s BETWEEN ? AND ?', from_value, to_value]
         end
       end
 

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -55,7 +55,7 @@ module ActiveScaffold
       def active_scaffold_render_subform_column(column, scope, crud_type, readonly, add_class = false, record = nil) # rubocop:disable Metrics/ParameterLists
         if add_class
           col_class = []
-          col_class << 'required' if column.required?
+          col_class << 'required' if column.required?(action_for_validation?(record))
           col_class << column.css_class unless column.css_class.nil? || column.css_class.is_a?(Proc)
           col_class << 'hidden' if column_renders_as(column) == :hidden
           col_class << 'checkbox' if column.form_ui == :checkbox
@@ -85,13 +85,17 @@ module ActiveScaffold
         options
       end
 
+      def action_for_validation?(record)
+        record&.persisted? ? :update : :create
+      end
+
       # the standard active scaffold options used for class, name and scope
       def active_scaffold_input_options(column, scope = nil, options = {})
         name = scope ? "record#{scope}[#{column.name}]" : "record[#{column.name}]"
         record = options[:object]
 
         # Add some HTML5 attributes for in-browser validation and better user experience
-        if column.required? && (!@disable_required_for_new || scope.nil? || record&.persisted?)
+        if column.required?(action_for_validation?(record)) && (!@disable_required_for_new || scope.nil? || record&.persisted?)
           options[:required] = true
         end
         options[:placeholder] = column.placeholder if column.placeholder.present?
@@ -720,7 +724,9 @@ module ActiveScaffold
       # Try to get numerical constraints from model's validators
       def column_numerical_constraints(column, options)
         validators = column.active_record_class.validators.select do |v|
-          v.is_a?(ActiveModel::Validations::NumericalityValidator) && v.attributes.include?(column.name)
+          v.is_a?(ActiveModel::Validations::NumericalityValidator) &&
+            v.attributes.include?(column.name) &&
+            !v.options[:if] && !v.options[:unless]
         end
 
         equal_validator = validators.find { |v| v.options[:equal_to] }
@@ -770,7 +776,7 @@ module ActiveScaffold
       end
 
       def numerical_constraints_for_column(column, options)
-        constraints = Rails.cache.fetch("#{column.cache_key}#numerical_constarints") do
+        constraints = Rails.cache.fetch("#{column.cache_key}#numerical_constraints") do
           column_numerical_constraints(column, options)
         end
         constraints.merge(options)

data/lib/active_scaffold/version.rb

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

metadata

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