effective_logging 3.3.0 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ddf74b601f163ea150e25b7e529d1e8abf13664ea6d19389efb79a092e67e653
-  data.tar.gz: 99916c1974d5f545b53df560f94969d58a58b0d20381a7623ee97b54c947218e
+  metadata.gz: 4453f03163296e4fc99e3b71b9726b5d6a94c111464aabf554789639bd09db42
+  data.tar.gz: 2dcb56c63e969fa619cedf4a3deb2da0a4204b080f426f077eececabdb0faf94
 SHA512:
-  metadata.gz: 50589f9370ed4005cabfcaa8cc3377ec845b8800acd8f195434c3a288f123160c7e0636491b5f204d4e6b98d8f50dedc00500a5fba9bcd34be83ee6ccc46523a
-  data.tar.gz: 900e0b21b045f223333e852ba09d66c4e798edf855dd747fe6f251138f341b5d8b03f7d2da37c83a040a9b1b1e3cca941342692a0d065d6fd38f88d5d0639a88
+  metadata.gz: 60c3450c050554ae8edf1dc069f6bfa44eb8b444f5fe561f4cc3111162b4e60c8b1eb4f50cf6e56c6f48770313b62580081bac0a6852afa4d48b112997b738b1
+  data.tar.gz: d54d72ea79a1b414444f465f837d0342466b6dba91f7bf6415b0c47c0eed601b14961e7d4d299c26e179a456881efa2d243077cb86ad12fddb93964c8a693215

data/app/datatables/effective_log_changes_datatable.rb

@@ -2,7 +2,7 @@
 
 class EffectiveLogChangesDatatable < Effective::Datatable
   datatable do
-    order :updated_at
+    order :id, :desc
 
     col :updated_at, label: 'Date'
     col :id, visible: false
@@ -14,12 +14,12 @@ class EffectiveLogChangesDatatable < Effective::Datatable
     col :associated_to_s, visible: false, label: 'Associated'
 
     col :message, sort: false do |log|
-      (log.message || '').gsub!("\n", '<br>')
+      message = (log.message || '').gsub("\n", '<br>')
 
       if log.associated_id == attributes[:changes_to_id] && log.associated_type == attributes[:changes_to_type]
-        log.message
+        message
       else
-        "#{log.associated_type} #{log.associated_to_s} - #{log.message}"
+        "#{log.associated_type} #{log.associated_to_s} - #{message}"
       end
 
     end.search do |collection, term, column, sql_column|

data/app/datatables/effective_logs_datatable.rb

@@ -1,6 +1,6 @@
 class EffectiveLogsDatatable < Effective::Datatable
   datatable do
-    order :updated_at
+    order :id, :desc
 
     col :updated_at, label: 'Date'
     col :id, visible: false
@@ -15,6 +15,9 @@ class EffectiveLogsDatatable < Effective::Datatable
       col :status, search: { collection: EffectiveLogging.statuses }
     end
 
+    col :changes_to_type, visible: false
+    col :changes_to_id, visible: false
+
     col :associated_type, visible: false
     col :associated_id, visible: false, label: 'Associated Id'
     col :associated_to_s, label: 'Associated'
@@ -35,13 +38,21 @@ class EffectiveLogsDatatable < Effective::Datatable
   # A nil attributes[:log_id] means give me all the top level log entries
   # If we set a log_id then it's for sub logs
   collection do
-    scope = Effective::Log.deep.where(parent_id: attributes[:log_id])
+    scope = Effective::Log.includes(:user).where(parent_id: attributes[:log_id])
 
+    # Older syntax, pass by integer
     if attributes[:for]
       user_ids = Array(attributes[:for])
       scope = scope.where('user_id IN (?) OR (associated_id IN (?) AND associated_type = ?)', user_ids, user_ids, 'User')
     end
 
+    # Newer syntax, pass by object
+    if attributes[:for_id] && attributes[:for_type]
+      scope = scope.where(associated_id: attributes[:for_id], associated_type: attributes[:for_type])
+        .or(scope.where(changes_to_id: attributes[:for_id], changes_to_type: attributes[:for_type]))
+        .or(scope.where(user_id: attributes[:for_id], user_type: attributes[:for_type]))
+    end
+
     if attributes[:associated_id] && attributes[:associated_type]
       scope = scope.where(associated_id: attributes[:associated_id], associated_type: attributes[:associated_type])
     end

data/app/models/concerns/acts_as_loggable.rb

@@ -64,8 +64,12 @@ module ActsAsLoggable
     EffectiveRoles.roles_for(value) if attribute == :roles_mask && defined?(EffectiveRoles) && respond_to?(:roles)
   end
 
+  def logs_datatable
+    EffectiveLogsDatatable.new(for: self) if persisted?
+  end
+
   def log_changes_datatable
-    EffectiveLogChangesDatatable.new(changes_to_id: id, changes_to_type: self.class.name) if persisted?
+    EffectiveLogChangesDatatable.new(changes_to: self) if persisted?
   end
 
 end

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '3.3.0'.freeze
+  VERSION = '3.4.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-06 00:00:00.000000000 Z
+date: 2022-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails