lib/magic_grid/definition.rb in magic_grid-0.9.2 vs lib/magic_grid/definition.rb in magic_grid-0.9.3

@@ -1,11 +1,11 @@
 require 'will_paginate/view_helpers/action_view'
 
 module MagicGrid
   class Definition
     include WillPaginate::ActionView
-    attr_accessor :columns, :collection, :magic_id, :options, :params, :accepted,
+    attr_accessor :columns, :collection, :magic_id, :options, :params,
       :current_sort_col, :current_order, :default_order
 
     DEFAULTS = {
       :class => [],
       :top_pager => false,
@@ -98,14 +98,10 @@
         Rails.logger.debug "#{self.class.name}: Ignoring sorting on non-AR collection"
       end
 
       @options[:searchable] = [] if @options[:searchable] and not @options[:searchable].kind_of? Array
 
-      @accepted = [:action, :controller, param_key(:page)]
-      @accepted << param_key(:q) if @options[:searchable]
-      @accepted += @options[:listeners].values
-
       if @collection.respond_to?(:where) or @options[:listener_handler].respond_to?(:call)
         if @options[:listener_handler].respond_to? :call
           @collection = @options[:listener_handler].call(@collection)
         else
           @options[:listeners].each_pair do |key, value|
@@ -189,10 +185,10 @@
     def param(key, default=nil)
       @params.fetch(param_key(key), default)
     end
 
     def base_params
-      @params.select { |k,_| accepted.include? k.to_sym }.merge :magic_grid_id => @magic_id
+      @params.merge :magic_grid_id => @magic_id
     end
 
     def order(something)
       case something
       when 1, "1", :desc, :DESC, "desc", "DESC"