Merge branch 'dbagaric-master'

mfairburn · mfairburn · commit 0722b333fb28 · 2015-03-02T14:31:35.000Z
diff --git a/lib/activeadmin/inputs/filter_select2_multiple_input.rb b/lib/activeadmin/inputs/filter_select2_multiple_input.rb
@@ -2,7 +2,7 @@ module ActiveAdmin
   module Inputs
     class FilterSelect2MultipleInput < Formtastic::Inputs::SelectInput
 
-     include FilterBase
+     include ActiveAdmin::Inputs::Filters::Base
 
      def input_name
         "#{super}_in"
diff --git a/lib/activeadmin/select2.rb b/lib/activeadmin/select2.rb
@@ -2,4 +2,4 @@
 require 'activeadmin/select2/filter_select_input_extension.rb'
 require 'activeadmin/inputs/filter_select2_multiple_input.rb'
 
-ActiveAdmin::Inputs::FilterSelectInput.send :include, ActiveAdmin::Select2::Inputs::FilterSelectInputExtension
+ActiveAdmin::Inputs::Filters::SelectInput.send :include, ActiveAdmin::Select2::Inputs::FilterSelectInputExtension
