active_scaffold 3.4.33 → 3.4.34

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60cdf903df7b52febfb72af4ada25aa1dde35832
-  data.tar.gz: f91b93961a06dc90b8f637a377e0e1c766086b8b
+  metadata.gz: 5831aedbc0ccb79952a771522d0a768fdf0162cd
+  data.tar.gz: 49eae4e8f8fa5aaf500b3217fbc9581379904131
 SHA512:
-  metadata.gz: 3fbd34b94bbf32f7bce0acf7473eebe3a95969a184eb6a5144c0962edc13dd36466f7de6ef10a089b9bc12e7b57314b059eea4eb28e5c88994109f0ffa60626c
-  data.tar.gz: 0f831be90516eb337de6f593dd8ae7fa0bebdbdf9ae525ca10afd2c7d2b3a190f5d1f7fdb4b2cf758c75a936f3710ec2e684e9b22fe3b6e975465c2955c2246c
+  metadata.gz: d4a7f15f906733e041f3fdc3fe19f02bd425476735a7513048b425ee830d7617f5ac4ef958a4df30ea9413f85a3d4f72f06a93b4fa8834fc11e04bd39c12921c
+  data.tar.gz: 8d4b52569bad66e17e3f7230d48592175d35ca20e8855e8ec8e29c9a27327c886128ff848e9ba1917f8300389b6661a5364ab523097ea3f7faf8def0cb1c65c9

data/CHANGELOG

@@ -1,3 +1,13 @@
+= 3.4.34
+- Fix past, future and range on field search with rails 4, local time was used instead of UTC
+- Ignore search params when params[:id] is set
+- Eager load HABTM with scope using left join
+- Add active_scaffold/indicator.gif to precompile so rails 4.2 precompiles it
+- Add support for ActiveRecord::Enum so :select form_ui is used by default
+- Fix nested link on self-association belongs_to for rails >= 4.1
+- Fix update_column for boolean columns with default true on rails 4.2
+- Fix columns lost on tableless models on rails 4.2
+
 = 3.4.33
 - Fix _base_form when used with actions, so :multipart and :persistent can set to false instead of getting them from action config
 - Copy update.columns from create.columns, if not defined

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

@@ -199,7 +199,7 @@ jQuery(document).ready(function($) {
   });
   jQuery(document).on('ajax:complete', '.action_group.dyn > ul a', function(event) {
     var action_link = ActiveScaffold.find_action_link(event.target);
-    if (action_link.loading_indicator) action_link.loading_indicator.css('visibility','hidden');
+    if (action_link && action_link.loading_indicator) action_link.loading_indicator.css('visibility','hidden');
     jQuery(event.target).closest('.action_group.dyn > ul').remove();
   });
 
@@ -984,7 +984,7 @@ var ActiveScaffold = {
       complete: function(xhr, status) {
         element = as_form.find('#'+element.attr('id'));
         element.nextAll('img.loading-indicator').css('visibility','hidden');
-        var complete_element = element.length ? element : as_form; 
+        var complete_element = element.length ? element : as_form;
         complete_element.trigger('ajax:complete', [xhr, status]);
         if (ActiveScaffold.last_focus) {
           var item = jQuery(ActiveScaffold.last_focus);

data/lib/active_scaffold/actions/common_search.rb

@@ -38,7 +38,7 @@ module ActiveScaffold::Actions
       end
 
       def search_params
-        @search_params || active_scaffold_session_storage['search']
+        @search_params || active_scaffold_session_storage['search'] unless params[:id]
       end
 
       # The default security delegates to ActiveRecordPermissions.

data/lib/active_scaffold/actions/list.rb

@@ -73,7 +73,9 @@ module ActiveScaffold::Actions
           active_scaffold_config.send(action).columns.collect_visible(:flatten => true)
         end
       sorting = active_scaffold_config.list.user.sorting
-      columns_for_joins, columns_for_includes = columns.select { |c| c.includes.present? }.partition { |c| sorting.sorts_on? c }
+      columns_for_joins, columns_for_includes = columns.select { |c| c.includes.present? }.partition do |c|
+        sorting.sorts_on?(c) || (c.plural_association? && c.association.macro == :has_and_belongs_to_many && c.association.scope)
+      end
       active_scaffold_preload.concat columns_for_includes.map(&:includes).flatten.uniq
       active_scaffold_references.concat columns_for_joins.map(&:includes).flatten.uniq
     end

data/lib/active_scaffold/actions/nested.rb

@@ -91,7 +91,8 @@ module ActiveScaffold::Actions
           table_name =
             if active_scaffold_config.model == nested.association.active_record
               dependency = ActiveRecord::Associations::JoinDependency.new(chain.klass, chain.joins_values, [])
-              dependency.join_associations.find { |join| join.try(:reflection).try(:name) == nested.child_association.name }.try(:table).try(:right)
+              join_associations = Rails.version >= '4.1.0' ? dependency.join_root.children : dependency.join_associations
+              join_associations.find {|join| join.try(:reflection).try(:name) == nested.child_association.name}.try(:table).try(:right)
             end
           table_name ||= nested.association.active_record.table_name
           chain.where(table_name => {nested.association.active_record.primary_key => nested_parent_record}).readonly(false)

data/lib/active_scaffold/actions/update.rb

@@ -144,7 +144,9 @@ module ActiveScaffold::Actions
 
       value ||=
         unless @column.column.nil? || @column.column.null
-          @column.column.default == true ? false : @column.column.default
+          default_val = @column.column.default
+          default_val = @column.column.cast_type.type_cast_from_user default_val if Rails.version >= '4.2.0'
+          default_val == true ? false : default_val
         end
       unless @column.nil?
         value = column_value_from_param_value(@record, @column, value)

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

@@ -76,18 +76,18 @@ module ActiveScaffold
 
         module HumanConditionHelpers
           def active_scaffold_human_condition_date_bridge(column, value)
-            case value[:opt]
+            case value['opt']
             when 'RANGE'
-              range_type, range = value[:range].downcase.split('_')
+              range_type, range = value['range'].downcase.split('_')
               format = active_scaffold_human_condition_date_bridge_range_format(range_type, range)
               from, to = controller.class.date_bridge_from_to(column, value)
-              "#{column.active_record_class.human_attribute_name(column.name)} = #{as_(value[:range].downcase).downcase} (#{I18n.l(from, :format => format)})"
+              "#{column.active_record_class.human_attribute_name(column.name)} = #{as_(value['range'].downcase).downcase} (#{I18n.l(from, :format => format)})"
             when 'PAST', 'FUTURE'
               from, to = controller.class.date_bridge_from_to(column, value)
               "#{column.active_record_class.human_attribute_name(column.name)} #{as_('BETWEEN'.downcase).downcase} #{I18n.l(from)} - #{I18n.l(to)}"
             else
               from, to = controller.class.date_bridge_from_to(column, value)
-              "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value[:opt].downcase).downcase} #{I18n.l(from)} #{value[:opt] == 'BETWEEN' ? '- ' + I18n.l(to) : ''}"
+              "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value['opt'].downcase).downcase} #{I18n.l(from)} #{value['opt'] == 'BETWEEN' ? '- ' + I18n.l(to) : ''}"
             end
           end
 
@@ -113,7 +113,7 @@ module ActiveScaffold
         module Finder
           module ClassMethods
             def condition_for_date_bridge_type(column, value, like_pattern)
-              operator = ActiveScaffold::Finder::NUMERIC_COMPARATORS.include?(value[:opt]) && value[:opt] != 'BETWEEN' ? value[:opt] : nil
+              operator = ActiveScaffold::Finder::NUMERIC_COMPARATORS.include?(value['opt']) && value['opt'] != 'BETWEEN' ? value['opt'] : nil
               from_value, to_value = date_bridge_from_to(column, value)
 
               if column.search_sql.is_a? Proc
@@ -122,18 +122,24 @@ module ActiveScaffold
                 if operator.nil?
                   ['%{search_sql} BETWEEN ? AND ?', from_value.to_s(:db), to_value.to_s(:db)] unless from_value.nil? || to_value.nil?
                 else
-                  ["%{search_sql} #{value[:opt]} ?", from_value.to_s(:db)] unless from_value.nil?
+                  ["%{search_sql} #{value['opt']} ?", from_value.to_s(:db)] unless from_value.nil?
                 end
               end
             end
 
             def date_bridge_from_to(column, value)
               conversion = datetime_conversion_for_condition(column)
-              case value[:opt]
+              case value['opt']
               when 'RANGE'
-                date_bridge_from_to_for_range(column, value).collect(&conversion)
+                values = date_bridge_from_to_for_range(column, value)
+                # Avoid calling to_time, not needed and broken on rails >= 4, because return local time instead of UTC
+                values.collect!(&conversion) if conversion != :to_time
+                values
               when 'PAST', 'FUTURE'
-                date_bridge_from_to_for_trend(column, value).collect(&conversion)
+                values = date_bridge_from_to_for_trend(column, value)
+                # Avoid calling to_time, not needed and broken on rails >= 4, because return local time instead of UTC
+                values.collect!(&conversion) if conversion != :to_time
+                values
               else
                 %w(from to).collect { |field| condition_value_for_datetime(column, value[field], conversion) }
               end
@@ -171,7 +177,7 @@ module ActiveScaffold
             end
 
             def date_bridge_from_to_for_range(column, value)
-              case value[:range]
+              case value['range']
               when 'TODAY'
                 return date_bridge_now.beginning_of_day, date_bridge_now.end_of_day
               when 'YESTERDAY'
@@ -179,7 +185,7 @@ module ActiveScaffold
               when 'TOMORROW'
                 return date_bridge_now.in(1.day).beginning_of_day, date_bridge_now.in(1.day).end_of_day
               else
-                range_type, range = value[:range].downcase.split('_')
+                range_type, range = value['range'].downcase.split('_')
                 raise ArgumentError unless %w(week month year).include?(range)
                 case range_type
                 when 'this'

data/lib/active_scaffold/data_structures/column.rb

@@ -14,6 +14,8 @@ module ActiveScaffold::DataStructures
       @inplace_edit = value
     end
 
+    # :table to refresh list
+    # true or :row to refresh row
     attr_accessor :inplace_edit_update
 
     # Whether this column set is collapsed by default in contexts where collapsing is supported
@@ -335,14 +337,18 @@ module ActiveScaffold::DataStructures
 
       @text = @column.nil? || [:string, :text].include?(@column.type)
       if @column
-        @form_ui = case @column.type
-          when :boolean then :checkbox
-          when :text then :textarea
-        end
-        if @column.number?
+        if active_record_class.respond_to?(:defined_enums) && active_record_class.defined_enums[name.to_s]
+          @form_ui = :select
+          @options = {:options => active_record_class.send(name.to_s.pluralize).keys}
+        elsif @column.number?
           @number = true
           @form_ui = :number
           @options = {:format => :i18n_number}
+        else
+          @form_ui = case @column.type
+            when :boolean then :checkbox
+            when :text then :textarea
+          end
         end
       end
       @allow_add_existing = true

data/lib/active_scaffold/engine.rb

@@ -25,5 +25,7 @@ module ActiveScaffold
         ActiveRecord::Associations::SingularAssociation.send :include, ActiveScaffold::Tableless::SingularAssociation
       end
     end
+
+    config.assets.precompile << 'active_scaffold/indicator.gif' if Rails::VERSION::MAJOR >= 4
   end
 end

data/lib/active_scaffold/helpers/human_condition_helpers.rb

@@ -3,7 +3,7 @@ module ActiveScaffold
     # Helpers that assist with rendering of a human readable search statement
     module HumanConditionHelpers
       def active_scaffold_human_condition_for(column)
-        return if (value = field_search_params[column.name]).nil?
+        return if (value = field_search_params[column.name.to_s]).nil?
         search_ui = column.search_ui
         search_ui ||= column.column.type if column.column
         if override_human_condition_column?(column)

data/lib/active_scaffold/helpers/search_column_helpers.rb

@@ -54,7 +54,7 @@ module ActiveScaffold
 
       # the standard active scaffold options used for class, name and scope
       def active_scaffold_search_options(column)
-        {:name => "search[#{column.name}]", :class => "#{column.name}-input", :id => "search_#{column.name}", :value => field_search_params[column.name]}
+        {:name => "search[#{column.name}]", :class => "#{column.name}-input", :id => "search_#{column.name}", :value => field_search_params[column.name.to_s]}
       end
 
       def search_attribute(column, record)

data/lib/active_scaffold/tableless.rb

@@ -161,7 +161,7 @@ class ActiveScaffold::Tableless < ActiveRecord::Base
   end
 
   def self.columns
-    @columns ||= []
+    @tableless_columns ||= []
   end
   def self.table_name
     @table_name ||= ActiveModel::Naming.plural(self)

data/lib/active_scaffold/version.rb

@@ -2,7 +2,7 @@ module ActiveScaffold
   module Version
     MAJOR = 3
     MINOR = 4
-    PATCH = 33
+    PATCH = 34
 
     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.4.33
+  version: 3.4.34
 platform: ruby
 authors:
 - Many, see README
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-18 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.18
+        version: 3.2.22.2
     - - <
       - !ruby/object:Gem::Version
         version: '5'
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 3.2.18
+        version: 3.2.22.2
     - - <
       - !ruby/object:Gem::Version
         version: '5'