fix regression in fa0edec

seanlinsley · seanlinsley · commit 9062494907a7 · 2013-12-30T11:16:45.000-06:00
Ref: activeadmin#2523, activeadmin#2832
diff --git a/lib/active_admin/filters/forms.rb b/lib/active_admin/filters/forms.rb
@@ -66,8 +66,8 @@ def active_admin_filters_form_for(search, filters, options = {})
         form_for search, options do |f|
           filters.group_by{ |o| o[:attribute] }.each do |attribute, array|
             opts     = array.last # grab last-defined `filter` call from DSL
-            return if opts.key?(:if)     && !call_method_or_proc_on(self, opts[:if])
-            return if opts.key?(:unless) &&  call_method_or_proc_on(self, opts[:unless])
+            next if opts.key?(:if)     && !call_method_or_proc_on(self, opts[:if])
+            next if opts.key?(:unless) &&  call_method_or_proc_on(self, opts[:unless])
 
             f.filter attribute, opts.except(:if, :unless)
           end
diff --git a/spec/unit/filters/filter_form_builder_spec.rb b/spec/unit/filters/filter_form_builder_spec.rb
@@ -328,6 +328,12 @@ def filter(name, options = {})
             body.should_not have_tag "input", attributes: {name: "q[body_contains]"}
           end
         end
+        it "should successfully keep rendering other filters after one is hidden" do
+          filters = [{attribute: :body, verb => proc{ verb == :unless }}, {attribute: :author}]
+          body    = render_filter scope, filters
+          body.should_not have_tag "input",  attributes: {name: "q[body_contains]"}
+          body.should     have_tag "select", attributes: {name: "q[author_id_eq]"}
+        end
       end
     end
   end
