active_scaffold 3.7.12 → 4.0.0.rc1

data/app/views/active_scaffold_overrides/update_column.js.erb

@@ -1,4 +1,4 @@
-<% @column_span_id ||= element_cell_id(:id => @record.id.to_s, :action => 'update_column', :name => @column.name) -%>
+<% @column_span_id ||= element_cell_id(id: @record.id.to_s, action: 'update_column', name: @column.name) -%>
 <% unless successful? -%>
   <%= render 'update_messages' %>
   <% @record.reload -%>
@@ -7,7 +7,7 @@
      ipe_update = @column.inplace_edit_update if successful? -%>
   <% case ipe_update
      when :row -%>
-       ActiveScaffold.update_row('<%= element_row_id(:action => :list) %>', '<%= escape_javascript render('row', :record => @record) %>');
+       ActiveScaffold.update_row('<%= element_row_id(action: :list) %>', '<%= escape_javascript render('row', record: @record) %>');
   <% when :table -%>
        ActiveScaffold.replace_html('<%= active_scaffold_content_id %>', '<%= escape_javascript(render('list')) %>');
   <% else
@@ -15,12 +15,12 @@
        ActiveScaffold.update_inplace_edit('<%= @column_span_id %>','<%= escape_javascript(formatted_value) %>', <%= column_empty?(formatted_value).to_json %>);
     <% if ipe_update == :columns && @column.update_columns && !@column.update_columns.empty?
          @rendered = Set.new([@column.name]) -%>
-         <%= render :partial => 'update_column', :collection => @column.update_columns & active_scaffold_config.list.columns.visible_columns_names, :locals => {:row_id => element_row_id(:action => :list, :id => @record.id)} %>
+         <%= render partial: 'update_column', collection: @column.update_columns & active_scaffold_config.list.columns.visible_columns_names, locals: {row_id: element_row_id(action: :list, id: @record.id)} %>
     <% end %>
   <% end -%>
 <% else -%>
   ActiveScaffold.replace_html('<%= @column_span_id %>','<%= escape_javascript(get_column_value(@record, @column)) %>');
 <% end -%>
 <% if @column.calculation? -%>
-  ActiveScaffold.replace_html('<%= active_scaffold_calculations_id(:column => @column) %>', '<%= escape_javascript(render_column_calculation(@column, id_condition: false)) %>');
+  ActiveScaffold.replace_html('<%= active_scaffold_calculations_id(column: @column) %>', '<%= escape_javascript(render_column_calculation(@column, id_condition: false)) %>');
 <% end -%>

data/app/views/active_scaffold_overrides/update_row.js.erb

@@ -1 +1 @@
-ActiveScaffold.update_row('<%=element_row_id(:action => 'list', :id => @record.id)%>','<%=escape_javascript(render(:partial => list_record_view, :locals => {:record => @record}))%>');
+ActiveScaffold.update_row('<%=element_row_id(action: 'list', id: @record.id)%>','<%=escape_javascript(render('list_record', record: @record))%>');

data/lib/active_scaffold/actions/common_search.rb

@@ -2,9 +2,10 @@ module ActiveScaffold::Actions
   module CommonSearch
     def self.included(base)
       return if base < InstanceMethods
+
       base.send :include, InstanceMethods
       base.before_action :search_authorized_filter, only: :show_search
-      base.before_action :store_search_params_into_session, :only => %i[index show_search]
+      base.before_action :store_search_params_into_session, only: %i[index show_search]
       base.before_action :do_search, only: [:index]
       base.helper_method :search_params
     end
@@ -36,6 +37,7 @@ module ActiveScaffold::Actions
         outer_joins = []
         columns.each do |column|
           next if column.search_joins.blank?
+
           if column.includes.present? && list_columns.include?(column)
             references << (column.search_joins & column.includes)
             outer_joins << (column.search_joins - column.includes)
@@ -67,13 +69,13 @@ module ActiveScaffold::Actions
       # The default security delegates to ActiveRecordPermissions.
       # You may override the method to customize.
       def search_authorized?
-        authorized_for?(:crud_type => :read)
+        authorized_for?(crud_type: :read)
       end
 
       def search_authorized_filter
         action = active_scaffold_config.send(search_partial)
         link = action.link || action.class.link
-        raise ActiveScaffold::ActionNotAllowed unless send(link.security_method)
+        raise ActiveScaffold::ActionNotAllowed unless action_link_authorized?(link)
       end
     end
   end

data/lib/active_scaffold/actions/core.rb

@@ -4,11 +4,11 @@ module ActiveScaffold::Actions
       base.class_eval do
         before_action :set_vary_accept_header
         before_action :check_input_device
-        before_action :register_constraints_with_action_columns, :unless => :nested?
+        before_action :register_constraints_with_action_columns, unless: :nested?
         after_action :clear_flashes
         after_action :dl_cookie
         around_action :clear_storage
-        rescue_from ActiveScaffold::RecordNotAllowed, ActiveScaffold::ActionNotAllowed, :with => :deny_access
+        rescue_from ActiveScaffold::RecordNotAllowed, ActiveScaffold::ActionNotAllowed, with: :deny_access
       end
       base.helper_method :active_scaffold_config
       base.helper_method :successful?
@@ -27,7 +27,12 @@ module ActiveScaffold::Actions
       if request.get? || request.head?
         render_field_for_inplace_editing
         respond_to do |format|
-          format.js { render :action => 'render_field_inplace', :layout => false }
+          format.js { render action: 'render_field_inplace', layout: false }
+        end
+      elsif params[:tabbed_by]
+        add_tab
+        respond_to do |format|
+          format.js { render action: 'add_tab', layout: false }
         end
       else
         render_field_for_update_columns
@@ -55,13 +60,17 @@ module ActiveScaffold::Actions
 
     def render_field_for_inplace_editing
       @column = active_scaffold_config.columns[params[:update_column]]
-      @record = find_if_allowed(params[:id], :crud_type => :update, :column => params[:update_column])
+      @record = find_if_allowed(params[:id], crud_type: :update, column: params[:update_column])
     end
 
-    def render_field_for_update_columns
-      return if (@column = active_scaffold_config.columns[params.delete(:column)]).nil?
+    def add_tab
+      process_render_field_params
+      @column = @main_columns.find_by_name(params[:column])
+      @record = updated_record_with_form(@main_columns, {}, @scope)
+    end
+
+    def process_render_field_params
       @source_id = params.delete(:source_id)
-      @columns = @column.update_columns || []
       @scope = params.delete(:scope)
       if @scope
         @form_action = :subform
@@ -70,7 +79,14 @@ module ActiveScaffold::Actions
       end
       @form_action ||= params[:id] ? :update : :create
       @main_columns = active_scaffold_config.send(@form_action).columns
+    end
+
+    def render_field_for_update_columns
+      return if (@column = active_scaffold_config.columns[params.delete(:column)]).nil?
+
+      @columns = @column.update_columns || []
       @columns << @column.name if @column.options[:refresh_link] && @columns.exclude?(@column.name)
+      process_render_field_params
 
       @record =
         if @column.send_form_on_update_column
@@ -98,14 +114,14 @@ module ActiveScaffold::Actions
       record = new_model
       copy_attributes(saved_record, record) if saved_record
       apply_constraints_to_record(record) unless scope
-      create_association_with_parent record, true if nested?
-      update_record_from_params(record, columns, attributes || {}, true, search_attributes: @form_action == :field_search)
+      create_association_with_parent record, check_match: true if nested?
+      update_record_from_params(record, columns, attributes || {}, true)
     end
 
     def updated_record_with_column(column, value, scope)
       record = params[:id] ? copy_attributes(find_if_allowed(params[:id], :read)) : new_model
       apply_constraints_to_record(record) unless scope || params[:id]
-      create_association_with_parent record, true if nested?
+      create_association_with_parent record, check_match: true if nested?
       if @form_action == :field_search && value.is_a?(Array) && column.association&.singular?
         # don't assign value if it's an array and column is singular association,
         # e.g. value came from multi-select on search form
@@ -119,7 +135,7 @@ module ActiveScaffold::Actions
     end
 
     def subform_child_association
-      params[:child_association].presence || @scope&.split(']')&.first&.sub(/^\[/, '').presence
+      params[:child_association].presence || (@scope.split(']').first.sub(/^\[/, '').presence if @scope)
     end
 
     def parent_controller_name
@@ -140,7 +156,7 @@ module ActiveScaffold::Actions
       if association.collection?
         record.send(association.name) << parent
       else
-        record.send("#{association.name}=", parent)
+        record.send(:"#{association.name}=", parent)
       end
 
       if params[:nested] # form in nested scaffold, set nested parent_record to parent
@@ -160,6 +176,7 @@ module ActiveScaffold::Actions
 
     def parent_sti_controller
       return unless params[:parent_sti]
+
       unless defined? @parent_sti_controller
         controller = look_for_parent_sti_controller
         @parent_sti_controller = controller.controller_path == params[:parent_sti] ? controller : false
@@ -225,10 +242,10 @@ module ActiveScaffold::Actions
       render(
         options.reverse_merge(
           format => response_object,
-          :only => columns_names + [active_scaffold_config.model.primary_key],
-          :include => association_columns(columns_names),
-          :methods => virtual_columns(columns_names),
-          :status => response_status
+          only: columns_names + [active_scaffold_config.model.primary_key],
+          include: association_columns(columns_names),
+          methods: virtual_columns(columns_names),
+          status: response_status
         )
       )
     end
@@ -264,16 +281,18 @@ module ActiveScaffold::Actions
     def conditions_from_params
       @conditions_from_params ||= begin
         conditions = [{}]
+        supporting_range = %i[date datetime integer decimal float bigint]
         params.except(:controller, :action, :page, :sort, :sort_direction, :format, :id).each do |key, value|
           distinct = true if key.match?(/!$/)
           column = active_scaffold_config._columns_hash[key.to_s[0..(distinct ? -2 : -1)]]
           next unless column
+
           key = column.name.to_sym
           not_string = %i[string text].exclude?(column.type)
           next if active_scaffold_constraints[key]
           next if nested? && nested.param_name == key
 
-          range = %i[date datetime integer decimal float bigint].include?(column.type) && value.is_a?(String) && value.scan('..').size == 1
+          range = supporting_range.include?(column.type) && value.is_a?(String) && value.scan('..').size == 1
           value = value.split('..') if range
           value =
             if value.is_a?(Array)
@@ -317,6 +336,7 @@ module ActiveScaffold::Actions
     def sti_nested_build_options(klass)
       config = active_scaffold_config_for(klass)
       return unless config
+
       column = klass.inheritance_column
       return unless column && config._columns_hash[column]
 
@@ -351,6 +371,7 @@ module ActiveScaffold::Actions
     def check_input_device
       return unless session[:input_device_type].nil?
       return if request.env['HTTP_USER_AGENT'].nil?
+
       if request.env['HTTP_USER_AGENT'].match?(/(iPhone|iPod|iPad)/i)
         session[:input_device_type] = 'TOUCH'
         session[:hover_supported] = false
@@ -387,7 +408,7 @@ module ActiveScaffold::Actions
     # call this method in your action_link action to simplify processing of actions
     # eg for member action_link :fire
     # process_action_link_action do |record|
-    #   record.update_attributes(:fired => true)
+    #   record.update(fired: true)
     #   self.successful = true
     #   flash[:info] = 'Player fired'
     # end
@@ -399,27 +420,30 @@ module ActiveScaffold::Actions
       else
         @action_link = active_scaffold_config.action_links[action_name]
         if params[:id]
-          crud_type_or_security_options ||= {:crud_type => request.delete? ? :delete : :update, :action => action_name}
+          crud_type_or_security_options ||= {crud_type: request.delete? ? :delete : :update, action: action_name}
           get_row(crud_type_or_security_options)
           if @record.nil?
             self.successful = false
-            flash[:error] = as_(:no_authorization_for_action, :action => @action_link&.label(nil) || action_name)
+            flash[:error] = as_(:no_authorization_for_action, action: @action_link&.label(nil) || action_name)
           else
             yield @record
           end
         else
-          if @action_link && respond_to?(@action_link.security_method, true) && !send(@action_link.security_method)
-            raise ActiveScaffold::ActionNotAllowed
-          end
+          raise ActiveScaffold::ActionNotAllowed unless action_link_authorized? @action_link
+
           yield
         end
         respond_to_action(render_action)
       end
     end
 
+    def action_link_authorized?(link)
+      link&.security_method.nil? || !respond_to?(link.security_method, true) || Array(send(link.security_method))[0]
+    end
+
     def action_confirmation_respond_to_html(confirm_action = action_name.to_sym)
       link = active_scaffold_config.action_links[confirm_action]
-      render :action => 'action_confirmation', :locals => {:record => @record, :link => link}
+      render action: 'action_confirmation', locals: {record: @record, link: link}
     end
 
     def action_update_respond_on_iframe
@@ -427,11 +451,11 @@ module ActiveScaffold::Actions
     end
 
     def action_update_respond_to_html
-      redirect_to :action => 'index'
+      redirect_to action: 'index'
     end
 
     def action_update_respond_to_js
-      render :action => 'on_action_update', :formats => [:js], :layout => false
+      render action: 'on_action_update', formats: [:js], layout: false
     end
 
     def action_update_respond_to_xml
@@ -450,10 +474,10 @@ module ActiveScaffold::Actions
     def view_stale?
       objects = objects_for_etag
       if objects.is_a?(Array)
-        args = {:etag => objects.to_a}
+        args = {etag: objects.to_a}
         args[:last_modified] = @last_modified if @last_modified
       elsif objects.is_a?(Hash)
-        args = {:last_modified => @last_modified}.merge(objects)
+        args = {last_modified: @last_modified}.merge(objects)
       else
         args = objects
       end
@@ -478,6 +502,7 @@ module ActiveScaffold::Actions
 
     def respond_to_action(action)
       return unless !conditional_get_support? || view_stale?
+
       respond_to do |type|
         action_formats.each do |format|
           type.send(format) do
@@ -499,8 +524,8 @@ module ActiveScaffold::Actions
 
     def action_formats
       @action_formats ||=
-        if respond_to? "#{action_name}_formats", true
-          send("#{action_name}_formats")
+        if respond_to? :"#{action_name}_formats", true
+          send(:"#{action_name}_formats")
         else
           (default_formats + active_scaffold_config.formats).uniq
         end
@@ -515,8 +540,8 @@ module ActiveScaffold::Actions
         next unless cfg&.add_sti_create_links?
         return controller if cfg.sti_children.map(&:to_s).include? self.class.active_scaffold_config.model.name.underscore
       end
-    rescue ActiveScaffold::ControllerNotFound => ex
-      logger.warn "#{ex.message} looking for parent_sti of #{self.class.active_scaffold_config.model.name}"
+    rescue ActiveScaffold::ControllerNotFound => e
+      logger.warn "#{e.message} looking for parent_sti of #{self.class.active_scaffold_config.model.name}"
       nil
     end
   end

data/lib/active_scaffold/actions/create.rb

@@ -1,7 +1,7 @@
 module ActiveScaffold::Actions
   module Create
     def self.included(base)
-      base.before_action :create_authorized_filter, :only => %i[new create]
+      base.before_action :create_authorized_filter, only: %i[new create]
     end
 
     def new
@@ -17,42 +17,42 @@ module ActiveScaffold::Actions
     protected
 
     def response_location
-      url_for(params_for(:action => 'show', :id => @record.to_param)) if successful?
+      url_for(params_for(action: 'show', id: @record.to_param)) if successful?
     end
 
     def new_respond_to_html
       if successful?
-        render(:action => 'create')
+        render(action: 'create')
       else
         return_to_main
       end
     end
 
     def new_respond_to_js
-      render(:partial => 'create_form')
+      render(partial: 'create_form')
     end
 
     def create_respond_on_iframe
       do_refresh_list if successful? && active_scaffold_config.create.refresh_list && !render_parent?
       responds_to_parent do
-        render :action => 'on_create', :formats => [:js], :layout => false
+        render action: 'on_create', formats: [:js], layout: false
       end
     end
 
     def create_respond_to_html
       if successful?
-        flash[:info] = as_(:created_model, :model => ERB::Util.h(@record.to_label))
+        flash[:info] = as_(:created_model, model: ERB::Util.h(@record.to_label))
         if (action = active_scaffold_config.create.action_after_create)
-          redirect_to params_for(:action => action, :id => @record.to_param)
+          redirect_to params_for(action: action, id: @record.to_param)
         elsif params[:dont_close]
-          redirect_to params_for(:action => 'new')
+          redirect_to params_for(action: 'new')
         else
           return_to_main
         end
       elsif active_scaffold_config.actions.include?(:list) && active_scaffold_config.list.always_show_create
         list
       else
-        render(:action => 'create')
+        render(action: 'create')
       end
     end
 
@@ -64,7 +64,7 @@ module ActiveScaffold::Actions
           do_new
         end
       end
-      render :action => 'on_create'
+      render action: 'on_create'
     end
 
     def create_respond_to_xml
@@ -95,7 +95,7 @@ module ActiveScaffold::Actions
       active_scaffold_config.model.transaction do
         @record = new_model
         # before assign params, to set foreign_type of constraints in polymorphic association with multiple id
-        apply_constraints_to_record(@record, :allow_autosave => true)
+        apply_constraints_to_record(@record, allow_autosave: true)
         @record = update_record_from_params(@record, active_scaffold_config.create.columns, attributes)
         create_association_with_parent(@record) if nested?
         before_create_save(@record)
@@ -103,14 +103,15 @@ module ActiveScaffold::Actions
         self.successful = [@record.keeping_errors { @record.valid? }, @record.associated_valid?].all? # this syntax avoids a short-circuit
         create_save(@record) unless options[:skip_save]
       end
-    rescue ActiveRecord::ActiveRecordError => ex
-      flash[:error] = ex.message
+    rescue ActiveRecord::ActiveRecordError => e
+      flash[:error] = e.message
       self.successful = false
       @record ||= new_model # ensure @record exists or display form will fail
     end
 
     def create_save(record)
       return unless successful?
+
       record.save! && record.save_associated!
       after_create_save(record)
     end
@@ -129,17 +130,18 @@ module ActiveScaffold::Actions
     end
 
     def create_authorized?
-      if nested?
-        return false if nested.readonly? || nested.readonly_through_association?(active_scaffold_config.create.columns)
+      if nested? && (nested.readonly? || nested.readonly_through_association?(active_scaffold_config.create.columns))
+        return false
       end
-      authorized_for?(:crud_type => :create)
+
+      authorized_for?(crud_type: :create)
     end
 
     private
 
     def create_authorized_filter
       link = active_scaffold_config.create.link || self.class.active_scaffold_config.create.class.link
-      raise ActiveScaffold::ActionNotAllowed unless send(link.security_method)
+      raise ActiveScaffold::ActionNotAllowed unless action_link_authorized?(link)
     end
 
     def new_formats

data/lib/active_scaffold/actions/delete.rb

@@ -1,7 +1,7 @@
 module ActiveScaffold::Actions
   module Delete
     def self.included(base)
-      base.before_action :delete_authorized_filter, :only => [:destroy]
+      base.before_action :delete_authorized_filter, only: [:destroy]
     end
 
     def destroy
@@ -14,21 +14,21 @@ module ActiveScaffold::Actions
     protected
 
     def destroy_respond_to_html
-      flash[:info] = as_(:deleted_model, :model => ERB::Util.h(@record.to_label)) if successful?
+      flash[:info] = as_(:deleted_model, model: ERB::Util.h(@record.to_label)) if successful?
       return_to_main
     end
 
     def destroy_respond_to_js
       do_refresh_list if successful? && active_scaffold_config.delete.refresh_list && !render_parent?
-      render(:action => 'destroy')
+      render(action: 'destroy')
     end
 
     def destroy_respond_to_xml
-      render :xml => successful? ? '' : response_object, :only => active_scaffold_config.list.columns.visible_columns_names, :status => response_status
+      render xml: successful? ? '' : response_object, only: active_scaffold_config.list.columns.visible_columns_names, status: response_status
     end
 
     def destroy_respond_to_json
-      render :json => successful? ? '' : response_object, :only => active_scaffold_config.list.columns.visible_columns_names, :status => response_status
+      render json: successful? ? '' : response_object, only: active_scaffold_config.list.columns.visible_columns_names, status: response_status
     end
 
     def destroy_find_record
@@ -41,13 +41,11 @@ module ActiveScaffold::Actions
       record ||= destroy_find_record
       begin
         self.successful = record.destroy
-      rescue StandardError => exception
-        flash[:warning] = as_(:cant_destroy_record, :record => ERB::Util.h(record.to_label))
+      rescue StandardError => e
+        flash[:warning] = as_(:cant_destroy_record, record: ERB::Util.h(record.to_label))
         self.successful = false
         logger.warn do
-          "\n\n#{exception.class} (#{exception.message}):\n    " +
-            Rails.backtrace_cleaner.clean(exception.backtrace).join("\n    ") +
-            "\n\n"
+          "\n\n#{e.class} (#{e.message}):\n    #{Rails.backtrace_cleaner.clean(e.backtrace).join("\n    ")}\n\n"
         end
       end
     end
@@ -59,14 +57,14 @@ module ActiveScaffold::Actions
     end
 
     def delete_ignore?(record = nil)
-      (nested? && nested.readonly?) || !authorized_for?(:crud_type => :delete)
+      (nested? && nested.readonly?) || !authorized_for?(crud_type: :delete)
     end
 
     private
 
     def delete_authorized_filter
       link = active_scaffold_config.delete.link || self.class.active_scaffold_config.delete.class.link
-      raise ActiveScaffold::ActionNotAllowed unless Array(send(link.security_method))[0]
+      raise ActiveScaffold::ActionNotAllowed unless action_link_authorized?(link)
     end
 
     def destroy_formats

data/lib/active_scaffold/actions/field_search.rb

@@ -29,6 +29,7 @@ module ActiveScaffold::Actions
 
       def init_field_search_params(default_params)
         return unless (params[:search].is_a?(String) || search_params.nil?) && params[:search].blank?
+
         params[:search] = default_params.is_a?(Proc) ? instance_eval(&default_params) : default_params
       end
 
@@ -63,10 +64,18 @@ module ActiveScaffold::Actions
       end
 
       def grouped_search_finder_options
-        group_sql = calculation_for_group_by(search_group_column&.field || search_group_name, search_group_function) if search_group_function
-        group_by = group_sql&.to_sql || quoted_select_columns(search_group_column&.select_columns || [search_group_name])
-        select_query = grouped_search_select + (group_sql ? [group_sql.as(search_group_column.name.to_s)] : group_by)
-        {group: group_by, select: select_query, reorder: grouped_sorting(group_by)}
+        select_query = grouped_search_select
+        if search_group_function
+          group_sql = calculation_for_group_by(search_group_column&.field || search_group_name, search_group_function)
+          group_by = group_sql.to_sql
+          select_query += [group_sql.as(search_group_column.name.to_s)]
+          order = grouped_sorting(group_by)
+        else
+          group_by = quoted_select_columns(search_group_column&.select_columns || [search_group_name])
+          select_query += group_by
+          order = grouped_sorting
+        end
+        {group: group_by, select: select_query, reorder: order}
       end
 
       def grouped_search_select
@@ -75,16 +84,20 @@ module ActiveScaffold::Actions
         end
       end
 
-      def grouped_sorting(group_sql)
+      def grouped_sorting(group_sql = nil)
         return unless search_group_column && active_scaffold_config.list.user.sorting
-        group_sort = search_group_function ? group_sql : search_group_column.sort[:sql] if search_group_column.sortable?
-        grouped_columns = grouped_columns_calculations.merge(search_group_column.name => group_sort)
-        sorting = active_scaffold_config.list.user.sorting.clause(grouped_columns)
+
+        sorting = active_scaffold_config.list.user.sorting.clause(grouped_columns_sorting(group_sql))
         active_scaffold_config.active_record? ? sorting&.map(&Arel.method(:sql)) : sorting
       end
 
+      def grouped_columns_sorting(group_sql)
+        group_sql ||= search_group_column.sort[:sql] if search_group_column.sortable?
+        grouped_columns_calculations.merge(search_group_column.name => group_sql)
+      end
+
       def grouped_columns_calculations
-        @grouped_columns_calculations ||= list_columns[1..-1].each_with_object({}) do |c, h|
+        @grouped_columns_calculations ||= list_columns[1..].each_with_object({}) do |c, h|
           h[c.name] = calculation_for_group_search(c)
         end
       end
@@ -136,9 +149,10 @@ module ActiveScaffold::Actions
 
       def grouped_columns
         return if active_scaffold_config.field_search.grouped_columns.blank?
-        active_scaffold_config.field_search.grouped_columns.map do |col|
+
+        active_scaffold_config.field_search.grouped_columns.filter_map do |col|
           active_scaffold_config.columns[col]
-        end.compact
+        end
       end
 
       def field_search_params
@@ -146,11 +160,11 @@ module ActiveScaffold::Actions
       end
 
       def field_search_respond_to_html
-        render(:action => 'field_search')
+        render(action: 'field_search')
       end
 
       def field_search_respond_to_js
-        render(:partial => 'field_search')
+        render(partial: 'field_search')
       end
 
       def do_search
@@ -167,6 +181,7 @@ module ActiveScaffold::Actions
         columns = active_scaffold_config.field_search.columns
         search_params.each do |key, value|
           next unless columns.include? key
+
           column = active_scaffold_config.columns[key]
           search_condition = self.class.condition_for_column(column, value, text_search, session)
           next if search_condition.blank?