table_on_steroids 0.1.1.5 → 0.1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d2770c294afbaf743ff369c3e9a933e17ccb338c72b6f54882221d2c5747798
-  data.tar.gz: 1d277ff42c505cd979cb3abf64410257b29d84cb5c58c5dfd9b561deeb8c9527
+  metadata.gz: 8366b8de497d16595ce9014b84a6f5474a3acb31b7cdfb9d36b32b6f339843e8
+  data.tar.gz: '085a992475e3ca1190308f07bc786cbfea8a6e2d450842d1fbca381b769a86a0'
 SHA512:
-  metadata.gz: ead00f19adf88d70a2addd2c16a863aabab9c5f5aceff2ad8152536fbaaf87c31a96a489ad58b000226b0439fc34885e6a8eb57475fe9a8187915bdfc06dbabc
-  data.tar.gz: a04166b1d09e162e881628b0ac6a3d959301dea94234a1ba7e9257919518ac6a7ba2b24c2b5c4bffb65e95ac96c39957ba1490f3b98804372459d1c8d07abc5b
+  metadata.gz: 1417185b5afcf7f76fc62bfe647c8c755edae0addc1f07e857f035198e6c05c91af934f1ffb5f203bb339c9926ab33b4f13e3c653079d88f7900a5ccdf7ce1fa
+  data.tar.gz: 00032b6d606863e17298ed5e9f59aafc6bded91c2333401f752d47b2e5b22ae555d49e3e74c037f688872fa7a0bc74d36603e00220b7a599a9ef0dcc7760e853

data/app/controllers/concerns/table_on_steroids/table_concern.rb

@@ -37,11 +37,11 @@ module TableOnSteroids
       OBJECTS_PER_PAGE = 50
     end
   
-    def filter_and_order(objects, columns_on_steroid, global_search=nil, include_counts=false, all_pages=false )
+    def filter_and_order(objects, columns_on_steroid, global_search=nil, include_counts=false, all_pages=false, table_on_steroids=nil )
       # execute the global search if you have one
       if(params[:search].present?)
         objects = global_search.call(objects,params[:search]) if global_search
-        objects = all_column_search(objects,columns_on_steroid, params[:search]) if !global_search
+        objects = all_column_search(objects, columns_on_steroid, params[:search], table_on_steroids) if !global_search
       end
 
       [:activerecord, :array].each do |t|
@@ -64,7 +64,7 @@ module TableOnSteroids
             objects = objects.reorder(nil) if(objects.is_a?(ActiveRecord::Base) || objects.is_a?(ActiveRecord::Relation))
             objects = object_order[t][:order_lambda].call(objects)
           end
-      elsif  ( object_order = columns_on_steroid.select{ |c,v| v[t] && v[t][:default_order] }.first&.last).present?
+        elsif  ( object_order = columns_on_steroid.select{ |c,v| v[t] && v[t][:default_order] }.first&.last).present?
           if(object_order[t] && object_order[t][:order_lambda])  
             objects = objects.reorder(nil) if(objects.is_a?(ActiveRecord::Base) || objects.is_a?(ActiveRecord::Relation))
             objects = object_order[t][:order_lambda].call(objects)
@@ -104,8 +104,11 @@ module TableOnSteroids
       end
     end
 
-    def all_column_search(objects, columns_on_steroid, query)
-      matched_object_ids = []
+    def all_column_search(objects, columns_on_steroid, query, table_on_steroids=nil)
+      global_search_key = table_on_steroids&.dig(:global_search_key) || :id
+      global_search_key_params = {}
+      matched_object_keys = []
+
       [:activerecord, :array].each do |t|
         columns_on_steroid.each do |key, value|
           if(value[t].present? && ((value[t][:search_lambda].present? && !["date","integer"].include?(value[:datatype])) || value[t][:global_search_lambda].present?))
@@ -114,11 +117,13 @@ module TableOnSteroids
             else
               objects_returned = value[t][:search_lambda].call(objects, query)
             end
-            objects_returned.each{|o| matched_object_ids << o.id } if(objects_returned)
+            objects_returned.each{|o| matched_object_keys << o[global_search_key] } if(objects_returned)
           end
         end
       end
-      objects = objects.where(id: matched_object_ids.uniq)
+
+      global_search_key_params[global_search_key] = matched_object_keys.uniq
+      objects = objects.where(global_search_key_params)
     end
   
   

data/lib/table_on_steroids/version.rb

@@ -1,3 +1,3 @@
 module TableOnSteroids
-  VERSION = '0.1.1.5'
+  VERSION = '0.1.1.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: table_on_steroids
 version: !ruby/object:Gem::Version
-  version: 0.1.1.5
+  version: 0.1.1.6
 platform: ruby
 authors:
 - Marieke Gueye
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-05 00:00:00.000000000 Z
+date: 2019-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bootstrap-datepicker-rails