effective_logging 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b21edfec95b3f6878025e153f44ebb09bc798ac01d3a117aecfc85b341586078
-  data.tar.gz: 8c14b70a56c35b492b19d00fae30b786d871cd3ac95c7c61a34ca133b4533f9d
+  metadata.gz: d5019a8c1d47713eb61c59d6241d6c64517fdf512e80ec508048a9a87a27404a
+  data.tar.gz: 1145e529b40bf909ea60df6af22ded27459ce376c0b674cb3311d2d775901161
 SHA512:
-  metadata.gz: 82a1e987a4642e855ab022c2b81a258fdcf95ad55edea9698e7f2f3766773c0b9f78f8b932c965e64df1c4c8cb6821600dee97063dcfd65c2785f75059e01c52
-  data.tar.gz: 33699371abdac488fc0953ba85ab7117076a2b94cb07ce7c7744d86ab90b7d389d1df6a27b33e2920005e3f3406853a3d38a53cd5eb377de090550a0f5e9bfb2
+  metadata.gz: bb500c434341914ce32bf2e39e0e977db957aaee656a0a7f4d8df7eb4d7f1fca30593ce6b85de1dbde23864846f3941f191e65b7b828fee2a2cd5cceb1882dc9
+  data.tar.gz: 3b84818babf85513db6260069e74f1cd7575888efc667070413083f80bbe7e7a2371a58d651f67f75785c85592c702f3db01e206edf7af7abfc252f6aadd881a

data/app/datatables/effective_logs_datatable.rb

@@ -8,26 +8,30 @@ class EffectiveLogsDatatable < Effective::Datatable
     if attributes[:user] == false
       # Do not include
     else
-      col :user, search: :string, sort: false
+      col(:user, search: :string).search do |collection, term, column, sql_column|
+        klass = current_user.class
+        users = Effective::Resource.new(klass).search_any(term, columns: [:first_name, :middle_name, :last_name, :name, :email])
+        collection.where(user_type: klass.name, user_id: users)
+      end.sort do |collection, direction, column, sql_column|
+        collection.order(user_id: direction)
+      end
     end
 
     unless attributes[:status] == false
-      col :status, search: { collection: EffectiveLogging.statuses }
+      col :status, search: { collection: EffectiveLogging.statuses, fuzzy: false }
     end
 
-    col :changes_to_type, visible: false
-    col :changes_to_id, visible: false
+    col :changes_to_type, visible: false, sort: false
+    col :changes_to_id, visible: false, sort: false
 
-    col :associated_type, visible: false
-    col :associated_id, visible: false, label: 'Associated Id'
+    col :associated_type, visible: false, sort: false
+    col :associated_id, visible: false, label: 'Associated Id', sort: false
     col :associated_to_s, label: 'Associated'
 
-    col :message do |log|
+    col :message, sort: false do |log|
       (log.message || '').gsub("\n", '<br>')
     end
 
-    col :logs_count, visible: false
-
     col :details, visible: false, sort: false do |log|
       tableize_hash(log.details.except(:email))
     end

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '3.5.0'.freeze
+  VERSION = '3.5.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-26 00:00:00.000000000 Z
+date: 2022-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails