Merge pull request #350 from blueberryapps/global-and-column-search

Search in column and global together

Author: n-rodriguez

lib/ajax-datatables-rails/orm/active_record.rb

@@ -26,17 +26,18 @@ def paginate_records(records)
       # ----------------- SEARCH HELPER METHODS --------------------
 
       def build_conditions
-        if datatable.searchable?
-          build_conditions_for_datatable
-        else
-          build_conditions_for_selected_columns
+        @criteria ||= begin
+          criteria = [build_conditions_for_selected_columns]
+          criteria << build_conditions_for_datatable if datatable.searchable?
+          criteria.compact.reduce(:and)
         end
       end
 
       def build_conditions_for_datatable
+        columns  = searchable_columns.reject(&:searched?)
         criteria = search_for.inject([]) do |crit, atom|
           search = Datatable::SimpleSearch.new(value: atom, regex: datatable.search.regexp?)
-          crit << searchable_columns.map do |simple_column|
+          crit << columns.map do |simple_column|
             simple_column.search = search
             simple_column.search_query
           end.compact.reduce(:or)

spec/ajax-datatables-rails/orm/active_record_filter_records_spec.rb

@@ -23,6 +23,29 @@
     end
   end
 
+  describe '#build_conditions' do
+    before(:each) do
+      create(:user, username: 'johndoe', email: 'johndoe@example.com')
+      create(:user, username: 'msmith',  email: 'mary.smith@example.com')
+      create(:user, username: 'hsmith',  email: 'henry.smith@example.net')
+    end
+
+    context 'with column and global search' do
+      before(:each) do
+        datatable.params[:search] = { value: 'example.com', regex: 'false' }
+        datatable.params[:columns]['0'][:search][:value] = 'smith'
+      end
+
+      it 'return a filtered set of records' do
+        query = datatable.build_conditions
+        results = records.where(query).map(&:username)
+        expect(results).to include('msmith')
+        expect(results).not_to include('johndoe')
+        expect(results).not_to include('hsmith')
+      end
+    end
+  end
+
   describe '#build_conditions_for_datatable' do
     before(:each) do
       create(:user, username: 'johndoe', email: 'johndoe@example.com')