active_scaffold 3.4.17 → 3.4.18

data/lib/active_scaffold/helpers/association_helpers.rb

@@ -4,7 +4,7 @@ module ActiveScaffold
       # Cache the options for select
       def cache_association_options(association, conditions, klass, cache = true)
         if active_scaffold_config.cache_association_options && cache
-          @_associations_cache ||= Hash.new { |h,k| h[k] = {} }
+          @_associations_cache ||= Hash.new { |h, k| h[k] = {} }
           key = [association.name, association.active_record.name, klass.name].join('/')
           @_associations_cache[key][conditions] ||= yield
         else
@@ -14,8 +14,8 @@ module ActiveScaffold
 
       # Provides a way to honor the :conditions on an association while searching the association's klass
       def association_options_find(association, conditions = nil, klass = nil, record = nil)
-        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, call with record.", caller if record.nil? # TODO Remove when relying on @record is removed
-        record ||= @record # TODO Remove when relying on @record is removed
+        ActiveSupport::Deprecation.warn 'Relying on @record is deprecated, call with record.', caller if record.nil? # TODO: Remove when relying on @record is removed
+        record ||= @record # TODO: Remove when relying on @record is removed
         if klass.nil? && association.options[:polymorphic]
           class_name = record.send(association.foreign_type)
           if class_name.present?
@@ -33,7 +33,7 @@ module ActiveScaffold
           if method(:options_for_association_conditions).arity.abs == 2
             conditions = options_for_association_conditions(association, record)
           else
-            ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include record in your options_for_association_conditions overrided method.", caller if record.nil? # TODO Remove when relying on @record is removed
+            ActiveSupport::Deprecation.warn 'Relying on @record is deprecated, include record in your options_for_association_conditions overrided method.', caller if record.nil? # TODO: Remove when relying on @record is removed
             conditions = options_for_association_conditions(association)
           end
         end
@@ -89,7 +89,7 @@ module ActiveScaffold
         if method(:options_for_association_conditions).arity.abs == 2
           conditions = options_for_association_conditions(association, record)
         else
-          ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include record in your options_for_association_conditions overrided method.", caller if record.nil? # TODO Remove when relying on @record is removed
+          ActiveSupport::Deprecation.warn 'Relying on @record is deprecated, include record in your options_for_association_conditions overrided method.', caller if record.nil? # TODO: Remove when relying on @record is removed
           conditions = options_for_association_conditions(association)
         end
         association_options_count(association, conditions)

data/lib/active_scaffold/helpers/controller_helpers.rb

@@ -2,13 +2,13 @@ module ActiveScaffold
   module Helpers
     module ControllerHelpers
       def self.included(controller)
-        controller.class_eval { helper_method :params_for, :conditions_from_params, :main_path_to_return, :render_parent?, :render_parent_options, :render_parent_action, :nested_singular_association?, :build_associated, :generate_temporary_id, :generated_id}
+        controller.class_eval { helper_method :params_for, :conditions_from_params, :main_path_to_return, :render_parent?, :render_parent_options, :render_parent_action, :nested_singular_association?, :build_associated, :generate_temporary_id, :generated_id }
       end
-      
+
       include ActiveScaffold::Helpers::IdHelpers
-      
+
       def generate_temporary_id(record = nil, generated_id = nil)
-        (generated_id || (Time.now.to_f*1000).to_i.to_s).tap do |id|
+        (generated_id || (Time.now.to_f * 1000).to_i.to_s).tap do |id|
           (@temporary_ids ||= {})[record.class.name] = id if record
         end
       end
@@ -25,7 +25,7 @@ module ActiveScaffold
         blacklist = [:adapter, :position, :sort, :sort_direction, :page, :auto_pagination, :record, :commit, :_method, :authenticity_token, :iframe, :associated_id, :dont_close]
         unless @params_for
           @params_for = {}
-          params.except(*blacklist).each {|key, value| @params_for[key.to_sym] = value.duplicable? ? value.clone : value}
+          params.except(*blacklist).each { |key, value| @params_for[key.to_sym] = value.duplicable? ? value.clone : value }
           @params_for[:controller] = '/' + @params_for[:controller].to_s unless @params_for[:controller].to_s.first(1) == '/' # for namespaced controllers
           @params_for.delete(:id) if @params_for[:id].nil?
         end
@@ -42,14 +42,14 @@ module ActiveScaffold
           if params[:parent_scaffold] && nested? && nested.singular_association?
             parameters[:controller] = params[:parent_scaffold]
             exclude_parameters.concat [nested.param_name, :association, :parent_scaffold]
-            #parameters[:eid] = params[:parent_scaffold] # not neeeded anymore?
+            # parameters[:eid] = params[:parent_scaffold] # not neeeded anymore?
           end
           parameters.merge! nested.to_params if nested?
           if params[:parent_sti]
             parameters[:controller] = params[:parent_sti]
-            #parameters[:eid] = nil # not neeeded anymore?
+            # parameters[:eid] = nil # not neeeded anymore?
           end
-          parameters[:action] = "index"
+          parameters[:action] = 'index'
           parameters[:id] = nil
           params_for(parameters).except(*exclude_parameters)
         end
@@ -73,20 +73,23 @@ module ActiveScaffold
       end
 
       def render_parent_action
-        begin
-          @parent_action = :row
-          if params[:parent_sti]
-            parent_controller = "#{params[:parent_sti].to_s.camelize}Controller".constantize
-            @parent_action = :index if action_name == 'create' && parent_controller.active_scaffold_config.actions.include?(:create) && parent_controller.active_scaffold_config.create.refresh_list == true
-            @parent_action = :index if action_name == 'update' && parent_controller.active_scaffold_config.actions.include?(:update) && parent_controller.active_scaffold_config.update.refresh_list == true
-            @parent_action = :index if action_name == 'destroy' && parent_controller.active_scaffold_config.actions.include?(:delete) && parent_controller.active_scaffold_config.delete.refresh_list == true
+        if @parent_action.nil?
+          begin
+            @parent_action = :row
+            if params[:parent_sti]
+              parent_controller = "#{params[:parent_sti].to_s.camelize}Controller".constantize
+              @parent_action = :index if action_name == 'create' && parent_controller.active_scaffold_config.actions.include?(:create) && parent_controller.active_scaffold_config.create.refresh_list == true
+              @parent_action = :index if action_name == 'update' && parent_controller.active_scaffold_config.actions.include?(:update) && parent_controller.active_scaffold_config.update.refresh_list == true
+              @parent_action = :index if action_name == 'destroy' && parent_controller.active_scaffold_config.actions.include?(:delete) && parent_controller.active_scaffold_config.delete.refresh_list == true
+            end
+          rescue ActiveScaffold::ControllerNotFound => ex
+            logger.warn "#{ex.message} for parent_sti #{params[:parent_sti]}"
           end
-        rescue ActiveScaffold::ControllerNotFound
-        end if @parent_action.nil?
+        end
         @parent_action
       end
-      
-      # build an associated record for association 
+
+      # build an associated record for association
       def build_associated(association, parent_record)
         if association.options[:through]
           # build full chain, only check create_associated on initial parent_record

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -12,14 +12,14 @@ module ActiveScaffold
 
       def active_scaffold_render_input(column, options)
         record = options[:object]
-        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include :object in options with record.", caller if record.nil? # TODO Remove when relying on @record is removed
-        record ||= @record # TODO Remove when relying on @record is removed
+        ActiveSupport::Deprecation.warn 'Relying on @record is deprecated, include :object in options with record.', caller if record.nil? # TODO: Remove when relying on @record is removed
+        record ||= @record # TODO: Remove when relying on @record is removed
 
         # first, check if the dev has created an override for this specific field
         if (method = override_form_field(column))
           send(method, record, options)
         # second, check if the dev has specified a valid form_ui for this column
-        elsif column.form_ui and (method = override_input(column.form_ui))
+        elsif column.form_ui && (method = override_input(column.form_ui))
           send(method, column, options)
         # fallback: we get to make the decision
         else
@@ -48,20 +48,20 @@ module ActiveScaffold
                 options[:maxlength] = column.column.limit
                 options[:size] ||= options[:maxlength].to_i > 30 ? 30 : options[:maxlength]
               end
-              options[:include_blank] = true if column.column.null and [:date, :datetime, :time].include?(column.column.type)
+              options[:include_blank] = true if column.column.null && [:date, :datetime, :time].include?(column.column.type)
               options[:value] = format_number_value(record.send(column.name), column.options) if column.number?
               text_field(:record, column.name, options.merge(column.options))
             end
           end
         end
-      rescue Exception => e
+      rescue StandardError => e
         logger.error "#{e.class.name}: #{e.message} -- on the ActiveScaffold column = :#{column.name} in #{controller.class}"
         raise e
       end
-      
+
       def active_scaffold_render_subform_column(column, scope, crud_type, readonly, add_class = false, record = nil)
-        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, call with record.", caller if record.nil? # TODO Remove when relying on @record is removed
-        record ||= @record # TODO Remove when relying on @record is removed
+        ActiveSupport::Deprecation.warn 'Relying on @record is deprecated, call with record.', caller if record.nil? # TODO: Remove when relying on @record is removed
+        record ||= @record # TODO: Remove when relying on @record is removed
         if add_class
           col_class = []
           col_class << 'required' if column.required?
@@ -70,15 +70,15 @@ module ActiveScaffold
           col_class << 'checkbox' if column.form_ui == :checkbox
           col_class = col_class.join(' ')
         end
-        unless readonly and not record.new_record? or not record.authorized_for?(:crud_type => crud_type, :column => column.name)
+        if readonly && !record.new_record? || !record.authorized_for?(:crud_type => crud_type, :column => column.name)
+          options = active_scaffold_input_options(column, scope).except(:name)
+          options[:class] = "#{options[:class]} #{col_class}" if col_class
+          content_tag :span, get_column_value(record, column), options
+        else
           renders_as = column_renders_as(column)
           html = render_column(column, record, renders_as, scope, false, col_class)
           html = content_tag(:div, html, active_scaffold_subform_attributes(column)) if renders_as == :subform
           html
-        else
-          options = active_scaffold_input_options(column, scope).except(:name)
-          options[:class] = "#{options[:class]} #{col_class}" if col_class
-          content_tag :span, get_column_value(record, column), options
         end
       end
 
@@ -110,11 +110,11 @@ module ActiveScaffold
         # Fix for keeping unique IDs in subform
         id_control = "record_#{column.name}_#{[params[:eid], params[:parent_id] || params[:id]].compact.join '_'}"
         id_control += scope_id(scope) if scope
-        
+
         classes = "#{column.name}-input"
         classes += ' numeric-input' if column.number?
 
-        { :name => name, :class => classes, :id => id_control}.merge(options)
+        {:name => name, :class => classes, :id => id_control}.merge(options)
       end
 
       def current_form_columns(record, scope, subform_controller = nil)
@@ -127,8 +127,8 @@ module ActiveScaffold
 
       def update_columns_options(column, scope, options, force = false)
         record = options[:object]
-        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include :object in options with record.", caller if record.nil? # TODO Remove when relying on @record is removed
-        record ||= @record # TODO Remove when relying on @record is removed
+        ActiveSupport::Deprecation.warn 'Relying on @record is deprecated, include :object in options with record.', caller if record.nil? # TODO: Remove when relying on @record is removed
+        record ||= @record # TODO: Remove when relying on @record is removed
         subform_controller = controller.class.active_scaffold_controller_for(record.class) if scope
         form_columns = @main_columns.try(:names) if scope.nil? || subform_controller == controller.class
         form_columns ||= current_form_columns(record, scope, subform_controller)
@@ -154,35 +154,36 @@ module ActiveScaffold
       def field_attributes(column, record)
         {}
       end
-      
+
       def render_column(column, record, renders_as, scope = nil, only_value = false, col_class = nil)
         if override_form_field_partial?(column)
-          render :partial => override_form_field_partial(column), :locals => { :column => column, :only_value => only_value, :scope => scope, :col_class => col_class, :record => record }
+          render :partial => override_form_field_partial(column), :locals => {:column => column, :only_value => only_value, :scope => scope, :col_class => col_class, :record => record}
         elsif renders_as == :field || override_form_field?(column)
           form_attribute(column, record, scope, only_value, col_class)
         elsif renders_as == :subform
-          render :partial => 'form_association', :locals => { :column => column, :scope => scope, :parent_record => record }
+          render :partial => 'form_association', :locals => {:column => column, :scope => scope, :parent_record => record}
         else
           form_hidden_attribute(column, record, scope)
         end
       end
-      
+
       def form_attribute(column, record, scope = nil, only_value = false, col_class = nil)
         column_options = active_scaffold_input_options(column, scope, :object => record)
         attributes = field_attributes(column, record)
         attributes[:class] = "#{attributes[:class]} #{col_class}" if col_class.present?
-        field = unless only_value
-          active_scaffold_input_for column, scope, column_options
-        else
-          content_tag(:span, get_column_value(record, column), column_options.except(:name, :object)) <<
-          hidden_field(:record, column.association ? column.association.foreign_key : column.name, column_options)
-        end
-        
+        field =
+          if only_value
+            content_tag(:span, get_column_value(record, column), column_options.except(:name, :object)) <<
+            hidden_field(:record, column.association ? column.association.foreign_key : column.name, column_options)
+          else
+            active_scaffold_input_for column, scope, column_options
+          end
+
         content_tag :dl, attributes do
-          %|<dt>#{label_tag label_for(column, column_options), column.label}</dt><dd>#{field}
+          %(<dt>#{label_tag label_for(column, column_options), column.label}</dt><dd>#{field}
 #{loading_indicator_tag(:action => :render_field, :id => params[:id]) if column.update_columns}
 #{content_tag :span, column.description, :class => 'description' if column.description.present?}
-</dd>|.html_safe
+</dd>).html_safe
         end
       end
 
@@ -193,11 +194,11 @@ module ActiveScaffold
       def subform_label(column, hidden)
         column.label unless hidden
       end
-      
+
       def form_hidden_attribute(column, record, scope = nil)
-        %|<dl style="display: none;"><dt></dt><dd>
+        %(<dl style="display: none;"><dt></dt><dd>
 #{hidden_field :record, column.name, active_scaffold_input_options(column, scope).merge(:object => record)}
-</dd></dl>|.html_safe
+</dd></dl>).html_safe
       end
 
       # Should this column be displayed in the subform?
@@ -210,13 +211,13 @@ module ActiveScaffold
         # A column shouldn't be in the subform if it's the reverse association to the parent
         return false if column.association.inverse_for?(parent_record.class)
 
-        return true
+        true
       end
 
       def column_show_add_existing(column, record = nil)
-        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, call with record.", caller if record.nil? # TODO Remove when relying on @record is removed
-        record ||= @record # TODO Remove when relying on @record is removed
-        (column.allow_add_existing and options_for_association_count(column.association, record) > 0)
+        ActiveSupport::Deprecation.warn 'Relying on @record is deprecated, call with record.', caller if record.nil? # TODO: Remove when relying on @record is removed
+        record ||= @record # TODO: Remove when relying on @record is removed
+        (column.allow_add_existing && options_for_association_count(column.association, record) > 0)
       end
 
       def column_show_add_new(column, associated, record)
@@ -228,13 +229,13 @@ module ActiveScaffold
       ##
       ## Form input methods
       ##
-      
+
       def active_scaffold_grouped_options(column, select_options, optgroup)
         group_column = active_scaffold_config_for(column.association.klass).columns[optgroup]
         group_label = group_column.options[:label_method] if group_column
         group_label ||= group_column.try(:association) ? :to_label : :to_s
         select_options.group_by(&optgroup.to_sym).collect do |group, options|
-          [group.send(group_label), options.collect {|r| [r.send(column.options[:label_method] || :to_label), r.id]}]
+          [group.send(group_label), options.collect { |r| [r.send(column.options[:label_method] || :to_label), r.id] }]
         end
       end
 
@@ -243,11 +244,11 @@ module ActiveScaffold
         options[:prompt] = as_(options[:prompt].to_s) if options[:prompt].is_a? Symbol
         options
       end
-      
+
       def active_scaffold_input_singular_association(column, html_options)
         record = html_options.delete(:object)
-        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include :object in html_options with record.", caller if record.nil? # TODO Remove when relying on @record is removed
-        record ||= @record # TODO Remove when relying on @record is removed
+        ActiveSupport::Deprecation.warn 'Relying on @record is deprecated, include :object in html_options with record.', caller if record.nil? # TODO: Remove when relying on @record is removed
+        record ||= @record # TODO: Remove when relying on @record is removed
         associated = record.send(column.association.name)
 
         select_options = sorted_association_options_find(column.association, nil, record)
@@ -258,14 +259,15 @@ module ActiveScaffold
 
         html_options.merge!(column.options[:html_options] || {})
         options.merge!(column.options)
-        html_options[:name] = "#{html_options[:name]}[]" if html_options[:multiple] == true && !html_options[:name].to_s.ends_with?("[]")
+        html_options[:name] = "#{html_options[:name]}[]" if html_options[:multiple] == true && !html_options[:name].to_s.ends_with?('[]')
         active_scaffold_translate_select_options(options)
 
-        html = if optgroup = options.delete(:optgroup)
-          select(:record, method, active_scaffold_grouped_options(column, select_options, optgroup), options, html_options)
-        else
-          collection_select(:record, method, select_options, :id, column.options[:label_method] || :to_label, options, html_options)
-        end
+        html =
+          if (optgroup = options.delete(:optgroup))
+            select(:record, method, active_scaffold_grouped_options(column, select_options, optgroup), options, html_options)
+          else
+            collection_select(:record, method, select_options, :id, column.options[:label_method] || :to_label, options, html_options)
+          end
         html << active_scaffold_refresh_link(column, html_options, record) if column.options[:refresh_link]
         html
       end
@@ -284,34 +286,35 @@ module ActiveScaffold
       end
 
       def active_scaffold_plural_association_options(column, record = nil)
-        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, call with record.", caller if record.nil? # TODO Remove when relying on @record is removed
-        record ||= @record # TODO Remove when relying on @record is removed
+        ActiveSupport::Deprecation.warn 'Relying on @record is deprecated, call with record.', caller if record.nil? # TODO: Remove when relying on @record is removed
+        record ||= @record # TODO: Remove when relying on @record is removed
         associated_options = record.send(column.association.name)
         [associated_options, associated_options | sorted_association_options_find(column.association, nil, record)]
       end
 
       def active_scaffold_input_plural_association(column, options)
         record = options.delete(:object)
-        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include :object in options with record.", caller if record.nil? # TODO Remove when relying on @record is removed
-        record ||= @record # TODO Remove when relying on @record is removed
+        ActiveSupport::Deprecation.warn 'Relying on @record is deprecated, include :object in options with record.', caller if record.nil? # TODO: Remove when relying on @record is removed
+        record ||= @record # TODO: Remove when relying on @record is removed
         associated_options, select_options = active_scaffold_plural_association_options(column, record)
-        
-        html = if select_options.empty?
-          content_tag(:span, as_(:no_options), :class => "#{options[:class]} no-options", :id => options[:id])
-        else
-          active_scaffold_checkbox_list(column, select_options, associated_options.collect(&:id), options)
-        end
+
+        html =
+          if select_options.empty?
+            content_tag(:span, as_(:no_options), :class => "#{options[:class]} no-options", :id => options[:id])
+          else
+            active_scaffold_checkbox_list(column, select_options, associated_options.collect(&:id), options)
+          end
         html << active_scaffold_refresh_link(column, options, record) if column.options[:refresh_link]
         html
       end
 
       def active_scaffold_checkbox_option(option, label_method, associated_ids, checkbox_options, li_options = {})
-        content_tag(:li, li_options) do 
+        content_tag(:li, li_options) do
           check_box_tag(checkbox_options[:name], option.id, associated_ids.include?(option.id), checkbox_options) <<
-          content_tag(:label, option.send(label_method), :for => checkbox_options[:id])
+            content_tag(:label, option.send(label_method), :for => checkbox_options[:id])
         end
       end
-      
+
       def active_scaffold_checkbox_list(column, select_options, associated_ids, options)
         label_method = column.options[:label_method] || :to_label
         html = hidden_field_tag("#{options[:name]}[]", '', :id => nil)
@@ -329,16 +332,16 @@ module ActiveScaffold
         value = text if value.nil?
         [(text.is_a?(Symbol) ? column.active_record_class.human_attribute_name(text) : text), value]
       end
-      
+
       def active_scaffold_enum_options(column, record = nil)
         column.options[:options]
       end
 
       def active_scaffold_input_enum(column, html_options)
         record = html_options.delete(:object)
-        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include :object in html_options with record.", caller if record.nil? # TODO Remove when relying on @record is removed
-        record ||= @record # TODO Remove when relying on @record is removed
-        options = { :selected => record.send(column.name), :object => record }
+        ActiveSupport::Deprecation.warn 'Relying on @record is deprecated, include :object in html_options with record.', caller if record.nil? # TODO: Remove when relying on @record is removed
+        record ||= @record # TODO: Remove when relying on @record is removed
+        options = {:selected => record.send(column.name), :object => record}
         options_for_select = active_scaffold_enum_options(column, record).collect do |text, value|
           active_scaffold_translated_option(column, text, value)
         end
@@ -361,16 +364,23 @@ module ActiveScaffold
       def active_scaffold_input_radio(column, html_options)
         record = html_options[:object]
         html_options.merge!(column.options[:html_options] || {})
-        options = if column.association
-          sorted_association_options_find(column.association, nil, record)
-        else
-          active_scaffold_enum_options(column, record)
-        end
+        options =
+          if column.association
+            sorted_association_options_find(column.association, nil, record)
+          else
+            active_scaffold_enum_options(column, record)
+          end
         id_key = html_options[:"data-id"] ? :"data-id" : :id
-        options.inject('') do |html, (text, value)|
-          method = column.options[:label_method] || :to_label if column.association
-          text, value = column.association ? [text.send(method), text.id] : active_scaffold_translated_option(column, text, value)
-          checked = {:checked => html_options[:object].send(column.association.name).try(:id) == value} if column.association
+        label_method = column.options[:label_method] || :to_label if column.association
+
+        options.each_with_object('') do |(text, value), html|
+          if column.association
+            text, value = [text.send(label_method), text.id]
+            checked = {:checked => html_options[:object].send(column.association.name).try(:id) == value}
+          else
+            text, value = active_scaffold_translated_option(column, text, value)
+          end
+
           radio_options = html_options.merge(id_key => html_options[id_key] + '-' + value.to_s)
           radio_options.merge!(checked) if checked
           html << content_tag(:label, radio_button(:record, column.name, value, radio_options) + text)
@@ -389,7 +399,7 @@ module ActiveScaffold
       def active_scaffold_input_textarea(column, options)
         text_area(:record, column.name, options.merge(:cols => column.options[:cols], :rows => column.options[:rows], :size => column.options[:size]))
       end
-      
+
       def active_scaffold_input_virtual(column, options)
         options = active_scaffold_input_text_options(options)
         text_field :record, column.name, options.merge(column.options)
@@ -436,8 +446,8 @@ module ActiveScaffold
 
       def active_scaffold_input_boolean(column, options)
         record = options.delete(:object)
-        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include :object in options with record.", caller if record.nil? # TODO Remove when relying on @record is removed
-        record ||= @record # TODO Remove when relying on @record is removed
+        ActiveSupport::Deprecation.warn 'Relying on @record is deprecated, include :object in options with record.', caller if record.nil? # TODO: Remove when relying on @record is removed
+        record ||= @record # TODO: Remove when relying on @record is removed
         select_options = []
         select_options << [as_(:_select_), nil] if !column.virtual? && column.column.null
         select_options << [as_(:true), true]
@@ -500,9 +510,9 @@ module ActiveScaffold
       def column_renders_as(column)
         if column.respond_to? :each
           return :subsection
-        elsif column.active_record_class.locking_column.to_s == column.name.to_s or column.form_ui == :hidden
+        elsif column.active_record_class.locking_column.to_s == column.name.to_s || column.form_ui == :hidden
           return :hidden
-        elsif column.association.nil? or column.form_ui or !active_scaffold_config_for(column.association.klass).actions.include?(:subform) or override_form_field?(column)
+        elsif column.association.nil? || column.form_ui || !active_scaffold_config_for(column.association.klass).actions.include?(:subform) || override_form_field?(column)
           return :field
         else
           return :subform
@@ -510,7 +520,7 @@ module ActiveScaffold
       end
 
       def column_scope(column, scope = nil, record = nil)
-        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, call with record.", caller if record.nil? # TODO Remove when relying on @record is removed
+        ActiveSupport::Deprecation.warn 'Relying on @record is deprecated, call with record.', caller if record.nil? # TODO: Remove when relying on @record is removed
         if column.plural_association?
           "#{scope}[#{column.name}][#{record.id || generate_temporary_id(record)}]"
         else
@@ -520,9 +530,9 @@ module ActiveScaffold
 
       def active_scaffold_add_existing_input(options)
         record = options.delete(:object)
-        ActiveSupport::Deprecation.warn "Relying on @record is deprecated, include :object in options with record.", caller if record.nil? # TODO Remove when relying on @record is removed
-        record ||= @record # TODO Remove when relying on @record is removed
-        if ActiveScaffold.js_framework == :prototype && controller.respond_to?(:record_select_config, true)
+        ActiveSupport::Deprecation.warn 'Relying on @record is deprecated, include :object in options with record.', caller if record.nil? # TODO: Remove when relying on @record is removed
+        record ||= @record # TODO: Remove when relying on @record is removed
+        if !ActiveScaffold.js_framework.nil? && controller.respond_to?(:record_select_config, true)
           remote_controller = active_scaffold_controller_for(record_select_config.model).controller_path
           options.merge!(:controller => remote_controller)
           options.merge!(active_scaffold_input_text_options)
@@ -548,51 +558,51 @@ module ActiveScaffold
         if column.numerical_constraints.nil?
           numerical_constraints = {}
           validators = column.active_record_class.validators.select do |v|
-            v.is_a? ActiveModel::Validations::NumericalityValidator and v.attributes.include? column.name
+            v.is_a?(ActiveModel::Validations::NumericalityValidator) && v.attributes.include?(column.name)
           end
-          equal_to = (v = validators.find{ |v| v.options[:equal_to] }) ? v.options[:equal_to] : nil
-          
+          equal_to = (val = validators.find { |v| v.options[:equal_to] }) ? val.options[:equal_to] : nil
+
           # If there is equal_to constraint - use it (unless otherwise specified by user)
-          if equal_to and not (options[:min] or options[:max])
+          if equal_to && !(options[:min] || options[:max])
             numerical_constraints[:min] = numerical_constraints[:max] = equal_to
           else # find minimum and maximum from validators
             # we can safely modify :min and :max by 1 for :greater_tnan or :less_than value only for integer values
             only_integer = column.column.type == :integer if column.column
-            only_integer ||= !!validators.find{ |v| v.options[:only_integer] }
+            only_integer ||= validators.find { |v| v.options[:only_integer] }.present?
             margin = only_integer ? 1 : 0
-            
+
             # Minimum
             unless options[:min]
-              min = validators.map{ |v| v.options[:greater_than_or_equal] }.compact.max
-              greater_than = validators.map{ |v| v.options[:greater_than] }.compact.max
-              numerical_constraints[:min] = [min, (greater_than+margin if greater_than)].compact.max
+              min = validators.map { |v| v.options[:greater_than_or_equal] }.compact.max
+              greater_than = validators.map { |v| v.options[:greater_than] }.compact.max
+              numerical_constraints[:min] = [min, (greater_than + margin if greater_than)].compact.max
             end
-            
+
             # Maximum
             unless options[:max]
-              max = validators.map{ |v| v.options[:less_than_or_equal] }.compact.min
-              less_than = validators.map{ |v| v.options[:less_than] }.compact.min
-              numerical_constraints[:max] = [max, (less_than-margin if less_than)].compact.min
+              max = validators.map { |v| v.options[:less_than_or_equal] }.compact.min
+              less_than = validators.map { |v| v.options[:less_than] }.compact.min
+              numerical_constraints[:max] = [max, (less_than - margin if less_than)].compact.min
             end
-            
+
             # Set step = 2 for column values restricted to be odd or even (but only if minimum is set)
             unless options[:step]
-              only_odd_valid  = validators.any?{ |v| v.options[:odd] }
-              only_even_valid = validators.any?{ |v| v.options[:even] } unless only_odd_valid
+              only_odd_valid  = validators.any? { |v| v.options[:odd] }
+              only_even_valid = validators.any? { |v| v.options[:even] } unless only_odd_valid
               if !only_integer
-                numerical_constraints[:step] ||= "0.#{'0'*(column.column.scale-1)}1" if column.column && column.column.scale.to_i > 0
-              elsif options[:min] and options[:min].respond_to? :even? and (only_odd_valid or only_even_valid)
+                numerical_constraints[:step] ||= "0.#{'0' * (column.column.scale - 1)}1" if column.column && column.column.scale.to_i > 0
+              elsif options[:min] && options[:min].respond_to?(:even?) && (only_odd_valid || only_even_valid)
                 numerical_constraints[:step] = 2
-                numerical_constraints[:min] += 1 if only_odd_valid  and not options[:min].odd?
-                numerical_constraints[:min] += 1 if only_even_valid and not options[:min].even?
+                numerical_constraints[:min] += 1 if only_odd_valid  && !options[:min].odd?
+                numerical_constraints[:min] += 1 if only_even_valid && !options[:min].even?
               end
               numerical_constraints[:step] ||= 'any' unless only_integer
             end
           end
-          
+
           column.numerical_constraints = numerical_constraints
         end
-        return column.numerical_constraints.merge(options)
+        column.numerical_constraints.merge(options)
       end
     end
   end