Merge pull request activeadmin#1611 from tinynumbers/index-filter-page-fix

Added fix for issue activeadmin#1610 - filtering the index when not on the first page should reset pagination to show the first page of results.

Author: James McKinney

features/index/filters.feature

@@ -38,6 +38,22 @@ Feature: Index Filtering
     And I should not see pagination
     And I should see "No Posts found"
 
+  Scenario: Filtering posts while not on the first page
+    Given 9 posts exist
+    And an index configuration of:
+    """
+      ActiveAdmin.register Post do
+        config.per_page = 5
+      end
+    """
+    When I follow "2"
+    Then I should see "Displaying Posts 6 - 9 of 9 in total"
+
+    When I fill in "Search Title" with "Hello World 2"
+    And I press "Filter"
+    And I should see 1 posts in the table
+    And I should see "Hello World 2" within ".index_table"
+
   Scenario: Checkboxes - Filtering posts written by anyone
     Given 1 post exists
     And a post with the title "Hello World" written by "Jane Doe" exists

lib/active_admin/filters/forms.rb

@@ -80,7 +80,7 @@ def active_admin_filters_form_for(search, filters, options = {})
           buttons = content_tag :div, :class => "buttons" do
             f.submit(I18n.t('active_admin.filter')) +
               clear_link +
-              hidden_field_tags_for(params, :except => :q)
+              hidden_field_tags_for(params, :except => [:q, :page])
           end
 
           f.form_buffers.last + buttons

lib/active_admin/view_helpers/fields_for.rb

@@ -15,11 +15,11 @@ module FormHelper
       #
       def fields_for_params(params, options = {})
         namespace = options[:namespace]
-        except = options[:except]
+        except = options[:except].is_a?(Array) ? options[:except] : [options[:except]]
 
         params.map do |k, v|
           next if namespace.nil? && %w(controller action commit utf8).include?(k.to_s)
-          next if except && k.to_s == except.to_s
+          next if except.map(&:to_s).include?(k.to_s)
 
           if namespace
             k = "#{namespace}[#{k}]"

spec/unit/view_helpers/fields_for_spec.rb

@@ -14,6 +14,11 @@
       should == [ { :scope => "All" } ]
   end
 
+  it "should allow an array for the except" do
+    fields_for_params({:scope => "All", :name => "Greg", :age => "12"}, :except => [:name, :age]).
+      should == [ { :scope => "All" } ]
+  end
+
   it "should work with hashes" do
     params = fields_for_params(:filters => { :name => "John", :age => "12" })
 
@@ -29,8 +34,8 @@
 
   it "should work with arrays" do
     fields_for_params(:people => ["greg", "emily", "philippe"]).
-      should == [ { "people[]" => "greg" }, 
-                  { "people[]" => "emily" }, 
+      should == [ { "people[]" => "greg" },
+                  { "people[]" => "emily" },
                   { "people[]" => "philippe" } ]
   end
 end