wice_grid 3.2.0 → 3.2.1.pre1

data/lib/wice_grid.rb

@@ -4,6 +4,7 @@ require 'wice_grid_misc.rb'
 require 'wice_grid_core_ext.rb'
 require 'grid_renderer.rb'
 require 'table_column_matrix.rb'
+require 'active_record_column_wrapper.rb'
 require 'helpers/wice_grid_view_helpers.rb'
 require 'helpers/wice_grid_misc_view_helpers.rb'
 require 'helpers/wice_grid_serialized_queries_view_helpers.rb'
@@ -13,8 +14,8 @@ require 'grid_output_buffer.rb'
 require 'wice_grid_controller.rb'
 require 'wice_grid_spreadsheet.rb'
 require 'wice_grid_serialized_queries_controller.rb'
-require 'view_columns/column_processor_index.rb'
-require 'view_columns.rb'
+require 'columns/column_processor_index.rb'
+require 'columns.rb'
 require 'kaminari.rb'
 
 
@@ -22,7 +23,7 @@ ActionController::Base.send(:helper_method, :wice_grid_custom_filter_params)
 
 module Wice
 
-  class WiceGridEngine < ::Rails::Engine
+  class WiceGridEngine < ::Rails::Engine #:nodoc:
 
     initializer "wice_grid_railtie.configure_rails_initialization" do |app|
 
@@ -44,7 +45,7 @@ module Wice
           JsCalendarHelpers.send(:include, m)
         end
 
-        ViewColumn.load_column_processors
+        Columns.load_column_processors
         require 'wice_grid_serialized_query.rb'
 
         # It is here only until this pull request is pulled: https://github.com/amatsuda/kaminari/pull/267
@@ -55,10 +56,10 @@ module Wice
 
   class WiceGrid
 
-    attr_reader :klass, :name, :resultset, :custom_order, :query_store_model
-    attr_reader :ar_options, :status, :export_to_csv_enabled, :csv_file_name, :csv_field_separator, :saved_query
-    attr_writer :renderer
-    attr_accessor :output_buffer, :view_helper_finished, :csv_tempfile
+    attr_reader :klass, :name, :resultset, :custom_order, :query_store_model #:nodoc:
+    attr_reader :ar_options, :status, :export_to_csv_enabled, :csv_file_name, :csv_field_separator, :saved_query #:nodoc:
+    attr_writer :renderer #:nodoc:
+    attr_accessor :output_buffer, :view_helper_finished, :csv_tempfile #:nodoc:
 
     # core workflow methods START
 
@@ -203,7 +204,7 @@ module Wice
       end
     end
 
-    def declare_column(column_name, model, custom_filter_active, table_alias)  #:nodoc:
+    def declare_column(column_name, model, custom_filter_active, table_alias, filter_type)  #:nodoc:
       if model # this is an included table
         column = @table_column_matrix.get_column_by_model_class_and_column_name(model, column_name)
         raise WiceGridArgumentError.new("Column '#{column_name}' is not found in table '#{model.table_name}'!") if column.nil?
@@ -221,7 +222,9 @@ module Wice
       end
 
       if column
-        conditions, current_parameter_name = column.wg_initialize_request_parameters(@status[:f], main_table, table_alias, custom_filter_active)
+        conditions_generator = ActiveRecordColumnWrapper.new(column, @status[:f], main_table, table_alias, custom_filter_active, filter_type)
+        conditions, current_parameter_name = conditions_generator.wg_initialize_request_parameters
+
         if @status[:f] && conditions.blank?
           @status[:f].delete(current_parameter_name)
         end
@@ -447,11 +450,6 @@ module Wice
     end
 
 
-    def selected_records #:nodoc:
-      STDERR.puts "WiceGrid: Parameter :#{selected_records} is deprecated, use :#{all_pages_records} or :#{current_page_records} instead!"
-      all_pages_records
-    end
-
     # Returns the list of objects browsable through all pages with the current filters.
     # Should only be called after the +grid+ helper.
     def all_pages_records
@@ -556,7 +554,7 @@ module Wice
     def resultset_without_paging_with_user_filters  #:nodoc:
       form_ar_options
       @klass.unscoped do
-        @relation.find(:all, :joins      => @ar_options[:joins],
+        @relation.find(:all, :joins   => @ar_options[:joins],
                           :include    => @ar_options[:include],
                           :group      => @ar_options[:group],
                           :conditions => @ar_options[:conditions],
@@ -575,7 +573,7 @@ module Wice
 
   end
 
-  # routines called from WiceGridExtentionToActiveRecordColumn (ActiveRecord::ConnectionAdapters::Column) or FilterConditionsGenerator classes
+  # routines called from WiceGridExtentionToActiveRecordColumn (ActiveRecord::ConnectionAdapters::Column) or ConditionsGeneratorColumn classes
   module GridTools   #:nodoc:
     class << self
       def special_value(str)   #:nodoc:
@@ -607,234 +605,6 @@ module Wice
     end
   end
 
-  # to be mixed in into ActiveRecord::ConnectionAdapters::Column
-  module WiceGridExtentionToActiveRecordColumn #:nodoc:
-
-    attr_accessor :model
-
-    def alias_or_table_name(table_alias)
-      table_alias || self.model.table_name
-    end
-
-    def wg_initialize_request_parameters(all_filter_params, main_table, table_alias, custom_filter_active)  #:nodoc:
-      @request_params = nil
-      return if all_filter_params.nil?
-
-      # if the parameter does not specify the table name we only allow columns in the default table to use these parameters
-      if main_table && @request_params  = all_filter_params[self.name]
-        current_parameter_name = self.name
-      elsif @request_params = all_filter_params[alias_or_table_name(table_alias) + '.' + self.name]
-        current_parameter_name = alias_or_table_name(table_alias) + '.' + self.name
-      end
-
-      # Preprocess incoming parameters for datetime, if what's coming in is
-      # a datetime (with custom_filter it can be anything else, and not
-      # the datetime hash {:fr => ..., :to => ...})
-      if @request_params
-        if (self.type == :datetime || self.type == :timestamp) && @request_params.is_a?(Hash)
-          [:fr, :to].each do |sym|
-            if @request_params[sym]
-              if @request_params[sym].is_a?(String)
-                @request_params[sym] = Wice::ConfigurationProvider.value_for(:DATETIME_PARSER).call(@request_params[sym])
-              elsif @request_params[sym].is_a?(Hash)
-                @request_params[sym] = Wice::GridTools.params_2_datetime(@request_params[sym])
-              end
-            end
-          end
-
-        end
-
-        # Preprocess incoming parameters for date, if what's coming in is
-        # a date (with custom_filter it can be anything else, and not
-        # the date hash {:fr => ..., :to => ...})
-        if self.type == :date && @request_params.is_a?(Hash)
-          [:fr, :to].each do |sym|
-            if @request_params[sym]
-              if @request_params[sym].is_a?(String)
-                @request_params[sym] = Wice::ConfigurationProvider.value_for(:DATE_PARSER).call(@request_params[sym])
-              elsif @request_params[sym].is_a?(Hash)
-                @request_params[sym] = ::Wice::GridTools.params_2_date(@request_params[sym])
-              end
-            end
-          end
-        end
-      end
-
-      return wg_generate_conditions(table_alias, custom_filter_active), current_parameter_name
-    end
-
-    def wg_generate_conditions(table_alias, custom_filter_active)  #:nodoc:
-      return nil if @request_params.nil?
-
-      if custom_filter_active
-        return ::Wice::FilterConditionsGeneratorCustomFilter.new(self).generate_conditions(table_alias, @request_params)
-      end
 
-      column_type = self.type.to_s
-
-      processor_class = ::Wice::FilterConditionsGenerator.handled_type[column_type]
-
-      if processor_class
-        return processor_class.new(self).generate_conditions(table_alias, @request_params)
-      else
-        Wice.log("No processor for database type #{column_type}!!!")
-        nil
-      end
-    end
-
-  end
-
-  class FilterConditionsGenerator   #:nodoc:
-
-    cattr_accessor :handled_type
-    @@handled_type = HashWithIndifferentAccess.new
-
-    def initialize(column)   #:nodoc:
-      @column = column
-    end
-  end
-
-  class FilterConditionsGeneratorCustomFilter < FilterConditionsGenerator #:nodoc:
-
-    def generate_conditions(table_alias, opts)   #:nodoc:
-      if opts.empty? || (opts.is_a?(Array) && opts.size == 1 && opts[0].blank?)
-        return false
-      end
-      opts = (opts.kind_of?(Array) && opts.size == 1) ? opts[0] : opts
-
-      if opts.kind_of?(Array)
-        opts_with_special_values, normal_opts = opts.partition{|v| ::Wice::GridTools.special_value(v)}
-
-        conditions_ar = if normal_opts.size > 0
-          [" #{@column.alias_or_table_name(table_alias)}.#{@column.name} IN ( " + (['?'] * normal_opts.size).join(', ') + ' )'] + normal_opts
-        else
-          []
-        end
-
-        if opts_with_special_values.size > 0
-          special_conditions = opts_with_special_values.collect{|v| " #{@column.alias_or_table_name(table_alias)}.#{@column.name} is " + v}.join(' or ')
-          if conditions_ar.size > 0
-            conditions_ar[0] = " (#{conditions_ar[0]} or #{special_conditions} ) "
-          else
-            conditions_ar = " ( #{special_conditions} ) "
-          end
-        end
-        conditions_ar
-      else
-        if ::Wice::GridTools.special_value(opts)
-          " #{@column.alias_or_table_name(table_alias)}.#{@column.name} is " + opts
-        else
-          [" #{@column.alias_or_table_name(table_alias)}.#{@column.name} = ?", opts]
-        end
-      end
-    end
-
-  end
-
-  class FilterConditionsGeneratorBoolean < FilterConditionsGenerator  #:nodoc:
-    @@handled_type[:boolean] = self
-
-    def  generate_conditions(table_alias, opts)   #:nodoc:
-      unless (opts.kind_of?(Array) && opts.size == 1)
-        Wice.log "invalid parameters for the grid boolean filter - must be an one item array: #{opts.inspect}"
-        return false
-      end
-      opts = opts[0]
-      if opts == 'f'
-        [" (#{@column.alias_or_table_name(table_alias)}.#{@column.name} = ? or #{@column.alias_or_table_name(table_alias)}.#{@column.name} is null) ", false]
-      elsif opts == 't'
-        [" #{@column.alias_or_table_name(table_alias)}.#{@column.name} = ?", true]
-      else
-        nil
-      end
-    end
-  end
-
-  class FilterConditionsGeneratorString < FilterConditionsGenerator  #:nodoc:
-    @@handled_type[:string] = self
-    @@handled_type[:text]   = self
-
-    def generate_conditions(table_alias, opts)   #:nodoc:
-      if opts.kind_of? String
-        string_fragment = opts
-        negation = ''
-      elsif (opts.kind_of? Hash) && opts.has_key?(:v)
-        string_fragment = opts[:v]
-        negation = opts[:n] == '1' ? 'NOT' : ''
-      else
-        Wice.log "invalid parameters for the grid string filter - must be a string: #{opts.inspect} or a Hash with keys :v and :n"
-        return false
-      end
-      if string_fragment.empty?
-        return false
-      end
-      [" #{negation}  #{@column.alias_or_table_name(table_alias)}.#{@column.name} #{::Wice.get_string_matching_operators(@column.model)} ?",
-          '%' + string_fragment + '%']
-    end
-
-  end
-
-  class FilterConditionsGeneratorInteger < FilterConditionsGenerator  #:nodoc:
-    @@handled_type[:integer] = self
-    @@handled_type[:float]   = self
-    @@handled_type[:decimal] = self
-
-    def  generate_conditions(table_alias, opts)   #:nodoc:
-      unless opts.kind_of? Hash
-        Wice.log "invalid parameters for the grid integer filter - must be a hash"
-        return false
-      end
-      conditions = [[]]
-      if opts[:fr]
-        if opts[:fr] =~ /\d/
-          conditions[0] << " #{@column.alias_or_table_name(table_alias)}.#{@column.name} >= ? "
-          conditions << opts[:fr]
-        else
-          opts.delete(:fr)
-        end
-      end
-
-      if opts[:to]
-        if opts[:to] =~ /\d/
-          conditions[0] << " #{@column.alias_or_table_name(table_alias)}.#{@column.name} <= ? "
-          conditions << opts[:to]
-        else
-          opts.delete(:to)
-        end
-      end
-
-      if conditions.size == 1
-        return false
-      end
-
-      conditions[0] = conditions[0].join(' and ')
-
-      return conditions
-    end
-  end
-
-  class FilterConditionsGeneratorDate < FilterConditionsGenerator  #:nodoc:
-    @@handled_type[:date]      = self
-    @@handled_type[:datetime]  = self
-    @@handled_type[:timestamp] = self
-
-    def generate_conditions(table_alias, opts)   #:nodoc:
-      conditions = [[]]
-      if opts[:fr]
-        conditions[0] << " #{@column.alias_or_table_name(table_alias)}.#{@column.name} >= ? "
-        conditions << opts[:fr]
-      end
-
-      if opts[:to]
-        conditions[0] << " #{@column.alias_or_table_name(table_alias)}.#{@column.name} <= ? "
-        conditions << opts[:to]
-      end
-
-      return false if conditions.size == 1
-
-      conditions[0] = conditions[0].join(' and ')
-      return conditions
-    end
-  end
 
 end

data/lib/wice_grid_controller.rb

@@ -17,7 +17,7 @@ module Wice
 
     protected
 
-    attr_accessor :wice_grid_instances
+    attr_accessor :wice_grid_instances #:nodoc:
 
     # Creates a grid object to be used in the view. This is the <i>main</i> model, and the underlying table is the default table -
     # if in other parameters a column name is mentioned without the name of the table, this table is implied.
@@ -163,7 +163,7 @@ module Wice
     private
 
 
-    def send_file_rails2(path, options = {}) #:doc:
+    def send_file_rails2(path, options = {}) #:nodoc:
       raise "Cannot read file #{path}" unless File.file?(path) and File.readable?(path)
 
       options[:length]   ||= File.size(path)
@@ -177,7 +177,7 @@ module Wice
     end
 
 
-    DEFAULT_SEND_FILE_OPTIONS_RAILS2 = {
+    DEFAULT_SEND_FILE_OPTIONS_RAILS2 = { #:nodoc:
       :type         => 'application/octet-stream'.freeze,
       :disposition  => 'attachment'.freeze,
       :stream       => true,
@@ -185,7 +185,7 @@ module Wice
       :x_sendfile   => false
     }.freeze
 
-    def send_file_headers_rails2!(options) #:doc:
+    def send_file_headers_rails2!(options) #:nodoc:
 
       options.update(DEFAULT_SEND_FILE_OPTIONS_RAILS2.merge(options))
       [:length, :type, :disposition].each do |arg|

data/lib/wice_grid_core_ext.rb

@@ -1,8 +1,8 @@
 # encoding: UTF-8
 
 module Wice
-  module WgHash
-    class << self
+  module WgHash #:nodoc:
+    class << self #:nodoc:
 
       # if there's a hash of hashes, the original structure and the
       # returned structure should not contain any shared deep hashes
@@ -105,7 +105,7 @@ module Wice
 
   end
 
-  module WgArray
+  module WgArray #:nodoc:
     # Only used by Hash#parameter_names_and_values
     # Transforms ['foo', 'bar', 'baz'] to 'foo[bar][baz]'
     def self.to_parameter_name(array) #:nodoc:

data/wice_grid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wice_grid"
-  s.version = "3.2.0"
+  s.version = "3.2.1.pre1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yuri Leikind"]
-  s.date = "2012-09-30"
+  s.date = "2012-12-14"
   s.description = "A Rails grid plugin to create grids with sorting, pagination, and (automatically generated) filters "
   s.email = "yuri.leikind@gmail.com"
   s.extra_rdoc_files = [
@@ -29,6 +29,18 @@ Gem::Specification.new do |s|
     "app/views/kaminari/wice_grid/_page.html.erb",
     "app/views/kaminari/wice_grid/_paginator.html.erb",
     "app/views/kaminari/wice_grid/_prev_page.html.erb",
+    "lib/active_record_column_wrapper.rb",
+    "lib/columns.rb",
+    "lib/columns/column_action.rb",
+    "lib/columns/column_boolean.rb",
+    "lib/columns/column_custom_dropdown.rb",
+    "lib/columns/column_date.rb",
+    "lib/columns/column_datetime.rb",
+    "lib/columns/column_float.rb",
+    "lib/columns/column_integer.rb",
+    "lib/columns/column_processor_index.rb",
+    "lib/columns/column_range.rb",
+    "lib/columns/column_string.rb",
     "lib/generators/wice_grid/add_migration_for_serialized_queries_generator.rb",
     "lib/generators/wice_grid/install_generator.rb",
     "lib/generators/wice_grid/templates/create_wice_grid_serialized_queries.rb",
@@ -43,16 +55,6 @@ Gem::Specification.new do |s|
     "lib/helpers/wice_grid_view_helpers.rb",
     "lib/kaminari_monkey_patching.rb",
     "lib/table_column_matrix.rb",
-    "lib/view_columns.rb",
-    "lib/view_columns/action_view_column.rb",
-    "lib/view_columns/column_processor_index.rb",
-    "lib/view_columns/view_column_boolean.rb",
-    "lib/view_columns/view_column_custom_dropdown.rb",
-    "lib/view_columns/view_column_date.rb",
-    "lib/view_columns/view_column_datetime.rb",
-    "lib/view_columns/view_column_float.rb",
-    "lib/view_columns/view_column_integer.rb",
-    "lib/view_columns/view_column_string.rb",
     "lib/wice_grid.rb",
     "lib/wice_grid_controller.rb",
     "lib/wice_grid_core_ext.rb",

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: wice_grid
 version: !ruby/object:Gem::Version
-  version: 3.2.0
-  prerelease: 
+  version: 3.2.1.pre1
+  prerelease: 6
 platform: ruby
 authors:
 - Yuri Leikind
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-30 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: kaminari
@@ -48,6 +48,18 @@ files:
 - app/views/kaminari/wice_grid/_page.html.erb
 - app/views/kaminari/wice_grid/_paginator.html.erb
 - app/views/kaminari/wice_grid/_prev_page.html.erb
+- lib/active_record_column_wrapper.rb
+- lib/columns.rb
+- lib/columns/column_action.rb
+- lib/columns/column_boolean.rb
+- lib/columns/column_custom_dropdown.rb
+- lib/columns/column_date.rb
+- lib/columns/column_datetime.rb
+- lib/columns/column_float.rb
+- lib/columns/column_integer.rb
+- lib/columns/column_processor_index.rb
+- lib/columns/column_range.rb
+- lib/columns/column_string.rb
 - lib/generators/wice_grid/add_migration_for_serialized_queries_generator.rb
 - lib/generators/wice_grid/install_generator.rb
 - lib/generators/wice_grid/templates/create_wice_grid_serialized_queries.rb
@@ -62,16 +74,6 @@ files:
 - lib/helpers/wice_grid_view_helpers.rb
 - lib/kaminari_monkey_patching.rb
 - lib/table_column_matrix.rb
-- lib/view_columns.rb
-- lib/view_columns/action_view_column.rb
-- lib/view_columns/column_processor_index.rb
-- lib/view_columns/view_column_boolean.rb
-- lib/view_columns/view_column_custom_dropdown.rb
-- lib/view_columns/view_column_date.rb
-- lib/view_columns/view_column_datetime.rb
-- lib/view_columns/view_column_float.rb
-- lib/view_columns/view_column_integer.rb
-- lib/view_columns/view_column_string.rb
 - lib/wice_grid.rb
 - lib/wice_grid_controller.rb
 - lib/wice_grid_core_ext.rb
@@ -112,9 +114,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/lib/view_columns/action_view_column.rb

@@ -1,45 +0,0 @@
-# encoding: UTF-8
-module Wice
-
-  class ActionViewColumn < ViewColumn #:nodoc:
-    def initialize(grid_obj, html, param_name, select_all_buttons, object_property, view)  #:nodoc:
-      @view = view
-      @select_all_buttons   = select_all_buttons
-      self.grid             = grid_obj
-      self.html             = html
-      Wice::WgHash.add_or_append_class_value!(self.html, 'sel')
-      grid_name             = self.grid.name
-      @param_name           = param_name
-      @cell_rendering_block = lambda do |object, params|
-        selected = if params[grid_name] && params[grid_name][param_name] &&
-                      params[grid_name][param_name].index(object.send(object_property).to_s)
-          true
-        else
-          false
-        end
-        check_box_tag("#{grid_name}[#{param_name}][]", object.send(object_property), selected, :id => nil)
-      end
-    end
-
-    def in_html  #:nodoc:
-      true
-    end
-
-    def capable_of_hosting_filter_related_icons?  #:nodoc:
-      false
-    end
-
-    def name  #:nodoc:
-      return '' unless @select_all_buttons
-
-      content_tag(:div, '',
-        :class => 'clickable select-all',
-        :title => NlMessage['select_all']) + ' ' +
-      content_tag(:div, '',
-        :class => 'clickable deselect-all',
-        :title => NlMessage['deselect_all'])
-
-    end
-
-  end
-end

data/lib/view_columns/column_processor_index.rb

@@ -1,16 +0,0 @@
-# encoding: UTF-8
-module Wice
-    COLUMN_PROCESSOR_INDEX = ActiveSupport::OrderedHash[
-      :action   , 'action_view_column', # Special processor for action column, columns with checkboxes
-      :text     , 'view_column_string',
-      :string   , 'view_column_string',
-      :timestamp, 'view_column_datetime',
-      :datetime , 'view_column_datetime',
-      :date     , 'view_column_date',
-      :integer  , 'view_column_integer',
-      :float    , 'view_column_float',
-      :decimal  , 'view_column_float',
-      :custom   , 'view_column_custom_dropdown',  # Special processor for custom filter columns
-      :boolean  , 'view_column_boolean'
-    ]
-end

data/lib/view_columns/view_column_boolean.rb

@@ -1,23 +0,0 @@
-# encoding: UTF-8
-module Wice
-
-
-  class ViewColumnBoolean < ViewColumnCustomDropdown #:nodoc:
-    include ActionView::Helpers::FormOptionsHelper
-
-    attr_accessor :boolean_filter_true_label, :boolean_filter_false_label
-
-    def render_filter_internal(params) #:nodoc:
-      @custom_filter = {
-        @filter_all_label => nil,
-        @boolean_filter_true_label  => 't',
-        @boolean_filter_false_label => 'f'
-      }
-
-      @turn_off_select_toggling = true
-      super(params)
-    end
-  end
-
-
-end

data/lib/view_columns/view_column_custom_dropdown.rb

@@ -1,80 +0,0 @@
-# encoding: UTF-8
-module Wice
-
-
-  class ViewColumnCustomDropdown < ViewColumn #:nodoc:
-    include ActionView::Helpers::FormOptionsHelper
-
-    attr_accessor :filter_all_label
-    attr_accessor :custom_filter
-
-    def render_filter_internal(params) #:nodoc:
-      @query, @query_without_equals_sign, @parameter_name, @dom_id = form_parameter_name_id_and_query('')
-      @query_without_equals_sign += '%5B%5D='
-
-      @custom_filter = @custom_filter.call if @custom_filter.kind_of? Proc
-
-      if @custom_filter.kind_of? Array
-
-        @custom_filter = [[@filter_all_label, nil]] + @custom_filter.map{|label, value|
-          [label.to_s, value.to_s]
-        }
-
-      end
-
-      select_options = {:name => @parameter_name + '[]', :id => @dom_id, :class => 'custom-dropdown'}
-
-      if @turn_off_select_toggling
-        select_toggle = ''
-      else
-        if self.allow_multiple_selection
-          select_options[:multiple] = params.is_a?(Array) && params.size > 1
-
-          expand_icon_style, collapse_icon_style = nil, 'display: none'
-          expand_icon_style, collapse_icon_style = collapse_icon_style, expand_icon_style if select_options[:multiple]
-
-          select_toggle = content_tag(:span, '',
-            :title => NlMessage['expand'],
-            :class => 'expand-multi-select-icon clickable',
-            :style => expand_icon_style
-          ) +
-          content_tag(:span, '',
-            :title => NlMessage['collapse'],
-            :class => 'collapse-multi-select-icon clickable',
-            :style => collapse_icon_style
-          )
-        else
-          select_options[:multiple] = false
-          select_toggle = ''
-        end
-      end
-
-      if auto_reload
-        select_options[:class] += ' auto-reload'
-      end
-
-      params_for_select = (params.is_a?(Hash) && params.empty?) ? [nil] : params
-
-      '<div class="custom-dropdown-container">'.html_safe +
-        content_tag(:select,
-          options_for_select(@custom_filter, params_for_select),
-          select_options) +  select_toggle.html_safe + '</div>'.html_safe
-    end
-
-
-    def yield_declaration_of_column_filter #:nodoc:
-      {
-        :templates => [@query_without_equals_sign],
-        :ids       => [@dom_id]
-      }
-    end
-
-
-    def has_auto_reloading_select? #:nodoc:
-      auto_reload
-    end
-  end
-
-
-
-end