use the form buffer!

Author: seanlinsley

lib/active_admin/filters/forms.rb

@@ -5,13 +5,16 @@ module Filters
     # as the one found in the sidebar of the index page of a standard resource.
     class FormBuilder < ::ActiveAdmin::FormBuilder
 
+      def initialize(*args)
+        @use_form_buffer = true # force ActiveAdmin::FormBuilder to use the form buffer
+        super
+      end
+
       def filter(method, options = {})
         method = method.to_s.sub(/_id\z/,'').to_sym
 
         if method.present? && options[:as] ||= default_input_type(method)
-          form_buffers.last << input(method, options)
-        else
-          ''
+          input(method, options)
         end
       end
 

lib/active_admin/form_builder.rb

@@ -9,15 +9,15 @@ def initialize(*args)
     end
 
     def inputs(*args, &block)
-      @inputs_with_block = block_given?
+      @use_form_buffer = block_given?
       form_buffers.last << with_new_form_buffer{ super }
     end
 
     # If this `input` call is inside a `inputs` block, add the content
     # to the form buffer. Else, return it directly.
     def input(method, *args)
       content = with_new_form_buffer{ super }
-      @inputs_with_block ? form_buffers.last << content : content
+      @use_form_buffer ? form_buffers.last << content : content
     end
 
     def cancel_link(url = {:action => "index"}, html_options = {}, li_attrs = {})