active_scaffold 3.7.12 → 4.0.0.rc1

data/lib/active_scaffold/helpers/controller_helpers.rb

@@ -3,13 +3,14 @@ module ActiveScaffold
     module ControllerHelpers
       def self.included(controller)
         return unless controller.respond_to? :helper_method
+
         controller.class_eval do
           helper_method :params_for, :conditions_from_params, :render_parent?,
                         :main_path_to_return, :render_parent_options,
                         :render_parent_action, :nested_singular_association?,
                         :main_form_controller, :build_associated,
                         :generate_temporary_id, :generated_id,
-                        :active_scaffold_config_for
+                        :active_scaffold_config_for, :tabbed_by_association
         end
       end
 
@@ -17,11 +18,7 @@ module ActiveScaffold
 
       def active_scaffold_config_for(klass)
         config = self.class.active_scaffold_config_for(klass)
-        if ActiveScaffold.threadsafe
-          config.user || config.new_user_settings({}, {})
-        else
-          config
-        end
+        config.user || config.new_user_settings({}, {})
       end
 
       def generate_temporary_id(record = nil, generated_id = nil)
@@ -67,7 +64,7 @@ module ActiveScaffold
           params.except(*BLACKLIST_PARAMS).each do |key, value|
             @params_for[key.to_sym] = copy_param(value)
           end
-          @params_for[:controller] = '/' + @params_for[:controller].to_s unless @params_for[:controller].to_s.first(1) == '/' # for namespaced controllers
+          @params_for[:controller] = "/#{@params_for[:controller]}" unless @params_for[:controller]&.first(1) == '/' # for namespaced controllers
           @params_for.delete(:id) if @params_for[:id].nil?
         end
 
@@ -86,7 +83,7 @@ module ActiveScaffold
 
       def controller_requested(controller)
         if controller.to_s.first(1) == '/'
-          controller[1..-1]
+          controller[1..]
         else
           path = controller_path.split('/')[0..-2]
           path << controller
@@ -111,7 +108,7 @@ module ActiveScaffold
           parameters = {}
           if params[:parent_scaffold] && nested_singular_association?
             parameters[:controller] = params[:parent_scaffold]
-            exclude_parameters.concat [nested.param_name, :association, :parent_scaffold]
+            exclude_parameters.push nested.param_name, :association, :parent_scaffold
             # parameters[:eid] = params[:parent_scaffold] # not neeeded anymore?
           end
           parameters.merge! nested.to_params if nested?
@@ -139,10 +136,10 @@ module ActiveScaffold
 
       def render_parent_options
         if nested_singular_association?
-          {:controller => nested.parent_scaffold.controller_path, :action => :index, :id => nested.parent_id}
+          {controller: nested.parent_scaffold.controller_path, action: :index, id: nested.parent_id}
         elsif parent_sti_controller
-          options = params_for(:controller => parent_sti_controller.controller_path, :action => render_parent_action, :parent_sti => nil)
-          options.merge!(:action => :index, :id => @record.to_param) if render_parent_action == :row
+          options = params_for(controller: parent_sti_controller.controller_path, action: render_parent_action, parent_sti: nil)
+          options.merge!(action: :index, id: @record.to_param) if render_parent_action == :row
           options
         end
       end
@@ -160,6 +157,10 @@ module ActiveScaffold
         @parent_action
       end
 
+      def tabbed_by_association(assoc_column, tabbed_by)
+        assoc_column.association.klass.reflect_on_association(tabbed_by)
+      end
+
       # build an associated record for association
       def build_associated(association, parent_record)
         if association.through? && association.through_reflection.collection?
@@ -178,23 +179,24 @@ module ActiveScaffold
         elsif association.belongs_to? || parent_record.new_record? || parent_record.send(association.name).nil?
           # avoid use build_association in has_one when record is saved and had associated record
           # because associated record would be changed in DB
-          parent_record.send("build_#{association.name}")
+          parent_record.send(:"build_#{association.name}")
         else
           association.klass.new.tap do |record|
             assign_default_attributes record
             save_record_to_association(record, association.reverse_association, parent_record) # set inverse
           end
-        end
+        end.tap { |record| yield record if block_given? }
       end
 
       def save_record_to_association(record, association, value, reverse = nil)
         return unless association
+
         if association.collection?
           record.association(association.name).target << value
         elsif reverse&.belongs_to?
-          value.send("#{reverse.name}=", record)
+          value.send(:"#{reverse.name}=", record)
         else
-          record.send("#{association.name}=", value)
+          record.send(:"#{association.name}=", value)
         end
       end
     end

data/lib/active_scaffold/helpers/form_column_helpers.rb

@@ -60,20 +60,20 @@ module ActiveScaffold
           col_class << 'checkbox' if column.form_ui == :checkbox
           col_class = col_class.join(' ')
         end
-        if readonly && !record.new_record? || !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)
           form_attribute(column, record, scope, true, col_class)
         else
           renders_as = column_renders_as(column)
-          html = render_column(column, record, renders_as, scope, false, col_class)
+          html = render_column(column, record, renders_as, scope, only_value: false, col_class: col_class)
           html = content_tag(:div, html, active_scaffold_subform_attributes(column)) if renders_as == :subform
           html
         end
       end
 
-      def active_scaffold_subform_attributes(column, column_css_class = nil, klass = nil)
+      def active_scaffold_subform_attributes(column, column_css_class = nil, klass = nil, tab_id: nil)
         {
-          :class => "sub-form #{active_scaffold_config_for(klass || column.association.klass).subform.layout}-sub-form #{column_css_class} #{column.name}-sub-form",
-          :id => sub_form_id(:association => column.name)
+          class: "sub-form #{active_scaffold_config_for(klass || column.association.klass).subform.layout}-sub-form #{column_css_class} #{column.name}-sub-form",
+          id: sub_form_id(association: column.name, tab_id: tab_id)
         }
       end
 
@@ -106,9 +106,7 @@ module ActiveScaffold
         classes = "#{column.name}-input"
         classes += ' numeric-input' if column.number?
 
-        if (column.form_ui_options || column.options)[:collapsible]
-          collapsible_id = "container_#{id_control}"
-        end
+        collapsible_id = "container_#{id_control}" if (column.form_ui_options || column.options)[:collapsible]
 
         {name: name, class: classes, id: id_control, collapsible_id: collapsible_id}.merge(options)
       end
@@ -119,6 +117,7 @@ module ActiveScaffold
         elsif %i[new create edit update render_field].include? action_name.to_sym
           # disable update_columns for inplace_edit (GET render_field)
           return if action_name == 'render_field' && request.get?
+
           active_scaffold_config.send(record.new_record? ? :create : :update).columns.visible_columns_names
         end
       end
@@ -155,29 +154,48 @@ module ActiveScaffold
         {}
       end
 
-      def render_column(column, record, renders_as, scope = nil, only_value = false, col_class = nil) # rubocop:disable Metrics/ParameterLists
+      def render_subsection(column, record, scope, form_action)
+        subsection_id = sub_section_id(sub_section: column.label)
+        locals = {columns: column, form_action: form_action, scope: scope}
+        header = content_tag(:h5) do
+          h(column.label) <<
+            link_to_visibility_toggle(subsection_id, default_visible: !column.collapsed)
+        end
+        if column.tabbed_by
+          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)
+            end
+          end
+        else
+          header << render('form', locals.merge(subsection_id: subsection_id))
+        end
+      end
+
+      def render_column(column, record, renders_as, scope = nil, only_value: false, col_class: nil, **subform_locals)
         if form_column_is_hidden?(column, record, scope)
           # creates an element that can be replaced by the update_columns routine,
           # but will not affect the value of the submitted form in this state:
           # <dl><input type="hidden" class="<%= column.name %>-input"></dl>
           content_tag :dl, style: 'display: none' do
-            hidden_field_tag(nil, nil, :class => "#{column.name}-input")
+            hidden_field_tag(nil, nil, class: "#{column.name}-input")
           end
         elsif (partial = override_form_field_partial(column))
-          render :partial => partial, :locals => {:column => column, :only_value => only_value, :scope => scope, :col_class => col_class, :record => record}
+          render partial, 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 'form_association', subform_locals.slice(:tabbed_by, :tab_value, :tab_id).merge(column: column, scope: scope, parent_record: record)
         else
           form_hidden_attribute(column, record, scope)
         end
       end
 
       def form_column_is_hidden?(column, record, scope = nil)
-        if column.hide_form_column_if&.respond_to?(:call)
+        if column.hide_form_column_if.respond_to?(:call)
           column.hide_form_column_if.call(record, column, scope)
-        elsif column.hide_form_column_if&.is_a?(Symbol)
+        elsif column.hide_form_column_if.is_a?(Symbol)
           record.send(column.hide_form_column_if)
         else
           column.hide_form_column_if
@@ -185,7 +203,7 @@ module ActiveScaffold
       end
 
       def form_attribute(column, record, scope = nil, only_value = false, col_class = nil)
-        column_options = active_scaffold_input_options(column, scope, :object => record)
+        column_options = active_scaffold_input_options(column, scope, object: record)
         collapsible_id = column_options.delete :collapsible_id
         attributes = field_attributes(column, record)
         attributes[:class] = "#{attributes[:class]} #{col_class}" if col_class.present?
@@ -201,9 +219,9 @@ module ActiveScaffold
           field = active_scaffold_input_for column, scope, column_options
         end
         if field
-          field << loading_indicator_tag(:action => :render_field, :id => params[:id]) if column.update_columns
+          field << loading_indicator_tag(action: :render_field, id: params[:id]) if column.update_columns
           desc = column.description(record, scope)
-          field << content_tag(:span, desc, :class => 'description') if desc.present?
+          field << content_tag(:span, desc, class: 'description') if desc.present?
         end
 
         label = label_tag(label_for(column, column_options), form_column_label(column, record, scope))
@@ -281,7 +299,7 @@ module ActiveScaffold
         assoc = column.association
         value = assoc.singular?
         value ||= assoc.collection? && !assoc.readonly? && (!assoc.through? || !assoc.through_reflection.collection?)
-        value &&= false unless assoc.klass.authorized_for?(:crud_type => :create)
+        value &&= false unless assoc.klass.authorized_for?(crud_type: :create)
         value
       end
 
@@ -306,6 +324,7 @@ module ActiveScaffold
 
       def active_scaffold_select_name_with_multiple(options)
         return if !options[:multiple] || options[:name].to_s.ends_with?('[]')
+
         options[:name] = "#{options[:name]}[]"
       end
 
@@ -317,7 +336,7 @@ module ActiveScaffold
         select_options.unshift(associated) unless associated.nil? || select_options.include?(associated)
 
         method = column.name
-        options.merge! :selected => associated&.id, :include_blank => as_(:_select_), :object => record
+        options.merge! selected: associated&.id, include_blank: as_(:_select_), object: record
 
         html_options.merge!(ui_options[:html_options] || {})
         options.merge!(ui_options)
@@ -344,6 +363,7 @@ module ActiveScaffold
             column.association.klass
           end
         return content_tag(:div, '') unless klass
+
         subform_attrs = active_scaffold_subform_attributes(column, nil, klass)
         if record.send(column.name)&.new_record?
           new_record = record.send(column.name)
@@ -361,6 +381,7 @@ module ActiveScaffold
         end
         html = content_tag(:div, subform, subform_attrs)
         return html if skip_link
+
         html << active_scaffold_show_new_subform_link(column, record, html_options[:id], subform_attrs[:id])
       end
 
@@ -370,7 +391,7 @@ module ActiveScaffold
         link_to(label, '#', data: data, class: 'show-new-subform')
       end
 
-      def active_scaffold_file_with_remove_link(column, options, content, remove_file_prefix, controls_class, ui_options: column.options, &block) # rubocop:disable Metrics/ParameterLists
+      def active_scaffold_file_with_remove_link(column, options, content, remove_file_prefix, controls_class, ui_options: column.options, &block)
         options = active_scaffold_input_text_options(options.merge(ui_options))
         if content
           active_scaffold_file_with_content(column, content, options, remove_file_prefix, controls_class, &block)
@@ -381,31 +402,25 @@ module ActiveScaffold
 
       def active_scaffold_file_with_content(column, content, options, remove_file_prefix, controls_class)
         required = options.delete(:required)
-        case ActiveScaffold.js_framework
-        when :jquery
-          js_remove_file_code = "jQuery(this).prev().val('true'); jQuery(this).parent().hide().next().show()#{".find('input').attr('required', 'required')" if required}; return false;"
-          js_dont_remove_file_code = "jQuery(this).parents('div.#{controls_class}').find('input.remove_file').val('false'); return false;"
-        when :prototype
-          js_remove_file_code = "$(this).previous().value='true'; $(this).up().hide().next().show()#{".down().writeAttribute('required', 'required')" if required}; return false;"
-          js_dont_remove_file_code = "jQuery(this).parents('div.#{controls_class}').find('input.remove_file').val('false'); return false;"
-        end
+        js_remove_file_code = "jQuery(this).prev().val('true'); jQuery(this).parent().hide().next().show()#{".find('input').attr('required', 'required')" if required}; return false;"
+        js_dont_remove_file_code = "jQuery(this).parents('div.#{controls_class}').find('input.remove_file').val('false'); return false;"
 
         object_name, method = options[:name].split(/\[(#{column.name})\]/)
         method.sub!(/#{column.name}/, "#{remove_file_prefix}\\0")
         fields = block_given? ? yield : ''
         link_key = options[:multiple] ? :remove_files : :remove_file
-        input = file_field(:record, column.name, options.merge(:onchange => js_dont_remove_file_code))
+        input = file_field(:record, column.name, options.merge(onchange: js_dont_remove_file_code))
         content_tag(:div, class: controls_class) do
           content_tag(:div) do
             safe_join [content, ' | ', fields,
-                       hidden_field(object_name, method, :value => 'false', class: 'remove_file'),
-                       content_tag(:a, as_(link_key), :href => '#', :onclick => js_remove_file_code)]
-          end << content_tag(:div, input, :style => 'display: none')
+                       hidden_field(object_name, method, value: 'false', class: 'remove_file'),
+                       content_tag(:a, as_(link_key), href: '#', onclick: js_remove_file_code)]
+          end << content_tag(:div, input, style: 'display: none')
         end
       end
 
       def active_scaffold_refresh_link(column, html_options, record, ui_options = {})
-        link_options = {:object => record}
+        link_options = {object: record}
         if html_options['data-update_url']
           link_options['data-update_send_form'] = html_options['data-update_send_form']
           link_options['data-update_send_form_selector'] = html_options['data-update_send_form_selector']
@@ -437,8 +452,8 @@ module ActiveScaffold
             active_scaffold_select_name_with_multiple html_options
             collection_select(:record, column.name, select_options, :id, ui_options[:label_method] || :to_label, ui_options.merge(object: record), html_options)
           elsif select_options.empty?
-            content_tag(:span, as_(:no_options), :class => "#{options[:class]} no-options", :id => options[:id]) <<
-              hidden_field_tag("#{options[:name]}[]", '', :id => nil)
+            content_tag(:span, as_(:no_options), class: "#{options[:class]} no-options", id: options[:id]) <<
+              hidden_field_tag("#{options[:name]}[]", '', id: nil)
           else
             active_scaffold_checkbox_list(column, select_options, associated_options.collect(&:id), options, ui_options: ui_options)
           end
@@ -455,7 +470,7 @@ module ActiveScaffold
           option_id = option.is_a?(Array) ? option[1] : option.id
           label = option.is_a?(Array) ? option[0] : option.send(label_method)
           check_box_tag(checkbox_options[:name], option_id, associated_ids.include?(option_id), checkbox_options) <<
-            content_tag(:label, label, :for => checkbox_options[:id])
+            content_tag(:label, label, for: checkbox_options[:id])
         end
       end
 
@@ -469,12 +484,12 @@ module ActiveScaffold
       def active_scaffold_checkbox_list(column, select_options, associated_ids, options, ui_options: column.options)
         label_method = ui_options[:label_method] || :to_label
         html = active_scaffold_check_all_buttons(column, options, ui_options: ui_options)
-        html << hidden_field_tag("#{options[:name]}[]", '', :id => nil)
+        html << hidden_field_tag("#{options[:name]}[]", '', id: nil)
         draggable = options.delete(:draggable_lists) || ui_options[:draggable_lists]
-        html << content_tag(:ul, options.merge(:class => "#{options[:class]} checkbox-list#{' draggable-lists' if draggable}")) do
+        html << content_tag(:ul, options.merge(class: "#{options[:class]} checkbox-list#{' draggable-lists' if draggable}")) do
           content = []
           select_options.each_with_index do |option, i|
-            content << active_scaffold_checkbox_option(option, label_method, associated_ids, :name => "#{options[:name]}[]", :id => "#{options[:id]}_#{i}_id")
+            content << active_scaffold_checkbox_option(option, label_method, associated_ids, name: "#{options[:name]}[]", id: "#{options[:id]}_#{i}_id")
           end
           safe_join content
         end
@@ -526,13 +541,13 @@ module ActiveScaffold
           label_method = ui_options[:label_method] || :to_label
           text = option.send(label_method)
           value = option.id
-          checked = {:checked => selected == value}
+          checked = {checked: selected == value}
         else
           text, value = active_scaffold_translated_option(column, *option)
         end
 
-        id_key = radio_options[:"data-id"] ? :"data-id" : :id
-        radio_options = radio_options.merge(id_key => radio_options[id_key] + '-' + value.to_s.parameterize)
+        id_key = radio_options[:'data-id'] ? :'data-id' : :id
+        radio_options = radio_options.merge(id_key => "#{radio_options[id_key]}-#{value.to_s.parameterize}")
         radio_options.merge!(checked) if checked
         content_tag(:label, radio_button(:record, column.name, value, radio_options) + text)
       end
@@ -554,7 +569,7 @@ module ActiveScaffold
           if ui_options[:add_new]
             html_options[:data] ||= {}
             html_options[:data][:subform_id] = active_scaffold_subform_attributes(column)[:id]
-            radio_html_options = html_options.merge(class: html_options[:class] + ' hide-new-subform')
+            radio_html_options = html_options.merge(class: "#{html_options[:class]} hide-new-subform")
           else
             radio_html_options = html_options
           end
@@ -567,14 +582,14 @@ module ActiveScaffold
             radios.prepend content_tag(:label, radio_button(:record, column.name, '', html_options.merge(id: nil)) + label)
           end
           if ui_options[:add_new]
-            create_new_button = radio_button_tag(html_options[:name], '', selected&.new_record?, html_options.merge(id: nil, class: html_options[:class] + ' show-new-subform').except(:object))
+            create_new_button = radio_button_tag(html_options[:name], '', selected&.new_record?, html_options.merge(id: nil, class: "#{html_options[:class]} show-new-subform").except(:object))
             radios << content_tag(:label, create_new_button << as_(:create_new)) <<
               active_scaffold_new_record_subform(column, record, html_options, ui_options: ui_options, skip_link: true)
           end
           safe_join radios
         else
-          html = content_tag(:span, as_(:no_options), :class => "#{html_options[:class]} no-options", :id => html_options[:id])
-          html << hidden_field_tag(html_options[:name], '', :id => nil)
+          html = content_tag(:span, as_(:no_options), class: "#{html_options[:class]} no-options", id: html_options[:id])
+          html << hidden_field_tag(html_options[:name], '', id: nil)
           html << active_scaffold_new_record_subform(column, record, html_options, ui_options: ui_options) if ui_options[:add_new]
           html
         end
@@ -698,6 +713,7 @@ module ActiveScaffold
         while controller.uses_active_scaffold?
           path = File.join(controller.controller_path, partial)
           return path if template_exists?(path, true)
+
           controller = controller.superclass
         end
         nil
@@ -739,7 +755,7 @@ module ActiveScaffold
           :subsection
         elsif column.active_record_class.locking_column.to_s == column.name.to_s || column.form_ui == :hidden
           :hidden
-        elsif column.association.nil? || column.form_ui || !active_scaffold_config_for(column.association.klass).actions.include?(:subform) || override_form_field?(column)
+        elsif column.association.nil? || column.form_ui || active_scaffold_config_for(column.association.klass).actions.exclude?(:subform) || override_form_field?(column)
           :field
         else
           :subform
@@ -756,7 +772,7 @@ module ActiveScaffold
 
       def active_scaffold_add_existing_input(options)
         record = options.delete(:object)
-        if !ActiveScaffold.js_framework.nil? && controller.respond_to?(:record_select_config, true)
+        if controller.respond_to?(:record_select_config, true)
           remote_controller = active_scaffold_controller_for(record_select_config.model).controller_path
           options[:controller] = remote_controller
           options.merge!(active_scaffold_input_text_options)
@@ -802,15 +818,15 @@ module ActiveScaffold
 
         # Minimum
         unless options[:min]
-          min = validators.map { |v| v.options[:greater_than_or_equal_to] }.compact.max
-          greater_than = validators.map { |v| v.options[:greater_than] }.compact.max
+          min = validators.filter_map { |v| v.options[:greater_than_or_equal_to] }.max
+          greater_than = validators.filter_map { |v| v.options[:greater_than] }.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_to] }.compact.min
-          less_than = validators.map { |v| v.options[:less_than] }.compact.min
+          max = validators.filter_map { |v| v.options[:less_than_or_equal_to] }.min
+          less_than = validators.filter_map { |v| v.options[:less_than] }.min
           numerical_constraints[:max] = [max, (less_than - margin if less_than)].compact.min
         end
 
@@ -820,7 +836,7 @@ module ActiveScaffold
           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&.scale.to_i.positive?
-          elsif options[:min] && options[:min].respond_to?(:even?) && (only_odd_valid || only_even_valid)
+          elsif options[:min].respond_to?(:even?) && (only_odd_valid || only_even_valid)
             numerical_constraints[:step] = 2
             numerical_constraints[:min] += 1 if only_odd_valid  && options[:min].even?
             numerical_constraints[:min] += 1 if only_even_valid && options[:min].odd?

data/lib/active_scaffold/helpers/human_condition_helpers.rb

@@ -4,6 +4,7 @@ module ActiveScaffold
     module HumanConditionHelpers
       def active_scaffold_human_condition_for(column)
         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)
@@ -23,7 +24,7 @@ module ActiveScaffold
       end
 
       def format_human_condition(column, opt, from = nil, to = nil)
-        attribute = column.label
+        attribute = column.active_record_class.human_attribute_name(column.name)
         opt ||= :between if from && to
         opt ||= from ? '>=' : '<='
         from = to = nil if opt&.in? %w[null not_null]
@@ -51,15 +52,15 @@ module ActiveScaffold
           range_type, range = value['range'].downcase.split('_')
           format = active_scaffold_human_condition_datetime_range_format(range_type, range)
           from, = controller.class.datetime_from_to(column, value)
-          "#{column.label} = #{as_(value['range'].downcase).downcase} (#{I18n.l(from, :format => format)})"
-        when 'PAST', 'FUTURE', 'BETWEEN'
+          "#{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.datetime_from_to(column, value)
-          "#{column.label} #{as_('between').downcase} #{I18n.l(from)} - #{I18n.l(to)}"
+          "#{column.active_record_class.human_attribute_name(column.name)} #{as_('BETWEEN'.downcase).downcase} #{I18n.l(from)} - #{I18n.l(to)}"
         when 'null', 'not_null'
-          "#{column.label} #{as_(value['opt'].downcase).downcase}"
+          "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value['opt'].downcase).downcase}"
         else
-          from, = controller.class.datetime_from_to(column, value)
-          "#{column.label} #{as_(value['opt'].downcase).downcase} #{I18n.l(from)}"
+          from, to = controller.class.datetime_from_to(column, value)
+          "#{column.active_record_class.human_attribute_name(column.name)} #{as_(value['opt'].downcase).downcase} #{I18n.l(from)} #{"- #{I18n.l(to)}" if value['opt'] == 'BETWEEN'}"
         end
       end
       alias active_scaffold_human_condition_time active_scaffold_human_condition_datetime
@@ -69,7 +70,7 @@ module ActiveScaffold
       def active_scaffold_human_condition_datetime_range_format(range_type, range)
         case range
         when 'week'
-          first_day_of_week = I18n.translate 'active_scaffold.date_picker_options.firstDay'
+          first_day_of_week = I18n.t 'active_scaffold.date_picker_options.firstDay'
           if first_day_of_week == 1
             '%W %Y'
           else
@@ -80,7 +81,7 @@ module ActiveScaffold
         when 'year'
           '%Y'
         else
-          I18n.translate 'date.formats.default'
+          I18n.t 'date.formats.default'
         end
       end
       # def active_scaffold_human_condition_date(column, value)
@@ -93,8 +94,8 @@ module ActiveScaffold
       # end
 
       def active_scaffold_human_condition_boolean(column, value)
-        attribute = column.label
-        as_(:boolean, :scope => :human_conditions, :column => attribute, :value => as_(value))
+        attribute = column.active_record_class.human_attribute_name(column.name)
+        as_(:boolean, scope: :human_conditions, column: attribute, value: as_(value))
       end
       alias active_scaffold_human_condition_checkbox active_scaffold_human_condition_boolean
 
@@ -103,16 +104,17 @@ module ActiveScaffold
       end
 
       def active_scaffold_human_condition_select(column, associated)
-        attribute = column.label
+        attribute = column.active_record_class.human_attribute_name(column.name)
         if associated.is_a?(Hash)
           return active_scaffold_human_condition_range(column, associated) unless associated['opt'] == '='
+
           associated = associated['from']
         end
         associated = [associated] unless associated.is_a? Array
-        associated = associated.select(&:present?)
+        associated = associated.compact_blank
         if column.association
           method = column.options[:label_method] || :to_label
-          associated = column.association.klass.where(:id => associated.map(&:to_i)).map(&method)
+          associated = column.association.klass.where(id: associated.map(&:to_i)).map(&method)
         elsif column.options[:options]
           associated = associated.collect do |value|
             text, val = column.options[:options].find { |t, v| (v.nil? ? t : v).to_s == value.to_s }
@@ -120,7 +122,7 @@ module ActiveScaffold
             value
           end
         end
-        as_(:association, :scope => :human_conditions, :column => attribute, :value => associated.join(', '))
+        as_(:association, scope: :human_conditions, column: attribute, value: associated.join(', '))
       end
       alias active_scaffold_human_condition_multi_select active_scaffold_human_condition_select
       alias active_scaffold_human_condition_select_multiple active_scaffold_human_condition_select

data/lib/active_scaffold/helpers/id_helpers.rb

@@ -6,8 +6,8 @@ module ActiveScaffold
         ERB::Util.h controller.to_s.gsub('/', '__')
       end
 
-      def controller_id(controller = (params[:eid] || nested_id || params[:parent_controller] || params[:controller]))
-        'as_' + id_from_controller(controller)
+      def controller_id(controller = params[:eid] || nested_id || params[:parent_controller] || params[:controller])
+        "as_#{id_from_controller(controller)}"
       end
 
       def nested?
@@ -39,7 +39,7 @@ module ActiveScaffold
       end
 
       def active_scaffold_calculations_id(options = {})
-        "#{options[:controller_id] || controller_id}-calculations#{'-' + options[:column].name.to_s if options[:column]}"
+        "#{options[:controller_id] || controller_id}-calculations#{"-#{options[:column].name}" if options[:column]}"
       end
 
       def empty_message_id
@@ -106,13 +106,13 @@ module ActiveScaffold
       def sub_form_id(options = {})
         options[:id] ||= params[:id]
         options[:id] ||= nested_parent_id if nested?
-        clean_id "#{controller_id}-#{options[:id]}-#{options[:association]}-subform"
+        clean_id "#{controller_id}-#{options[:id]}-#{options[:association]}#{'-' if options[:tab_id]}#{options[:tab_id]}-subform"
       end
 
       def sub_form_list_id(options = {})
         options[:id] ||= params[:id]
         options[:id] ||= nested_parent_id if nested?
-        clean_id "#{controller_id}-#{options[:id]}-#{options[:association]}-subform-list"
+        clean_id "#{controller_id}-#{options[:id]}-#{options[:association]}#{'-' if options[:tab_id]}#{options[:tab_id]}-subform-list"
       end
 
       def element_messages_id(options = {})