effective_logging 1.10.4 → 1.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d567d6badd11813f0275b72ada91d72306ca5a2
-  data.tar.gz: c0b753689f05b4140d0ae6c961e7f497bc5bc09e
+  metadata.gz: 2de145b956fd6e8284b0176ddb914f149e7e7ddc
+  data.tar.gz: 693cccaee263fde6fd67e186e20c3f44d72c9e22
 SHA512:
-  metadata.gz: adbbd2194efad68de68495fbaf513826daf0287102f4de0db0383a434348559c4d34271d09d4f336f7ea4bab1d7d2f152c5653788ffb9bc76e9d3f9bc6ecd9c6
-  data.tar.gz: ce68767bd2e1a015cd8860ddb4cc86f4e6b4e061140e077d2dc62cde691550410fff21f534051b7bb35eb23f38893e6743790c72ecbc11a01301766f56479472
+  metadata.gz: 9834c2c5d1383e9ea216126aa7dd92ee8c04092fcae2f22ec01b2c99e69633c150d88848212a7736d8db528f29998039f18eb932d4e4eb2a79839af959af9727
+  data.tar.gz: 43c2a682dda427c41995f9473ff9bf53a7cb5687f216c69fa321fc1a60a975bdb2745cb99204ac2dd14b1ff2efa8c206e1a67f3a86e486d0f0f609738efa9be8

data/app/models/effective/datatables/logs.rb

@@ -1,4 +1,4 @@
-if defined?(EffectiveDatatables)
+if defined?(EffectiveDatatables) && Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
   module Effective
     module Datatables
       class Logs < Effective::Datatable
@@ -74,3 +74,80 @@ if defined?(EffectiveDatatables)
     end
   end
 end
+
+if defined?(EffectiveDatatables) && Gem::Version.new(EffectiveDatatables::VERSION) >= Gem::Version.new('3.0')
+  module Effective
+    module Datatables
+      class Logs < Effective::Datatable
+        include EffectiveLoggingHelper
+
+        datatable do
+          order :updated_at
+
+          col :updated_at, label: 'Date'
+          col :id, visible: false
+
+          if attributes[:user] == false
+            # Do not include
+          elsif attributes[:user_id].present?
+            col :user, search: { collection: User.where(id: Array(attributes[:user_id])) }
+          elsif attributes[:user].present?
+            col :user, search: { collection: User.where(id: Array(attributes[:user]).map { |user| user.to_param }) }
+          else
+            col :user, search: {as: :string}
+          end
+
+          unless attributes[:status] == false
+            col :status, search: { collection: EffectiveLogging.statuses }
+          end
+
+          unless attributes[:log_changes]
+            col :associated_type, search: { as: :string }, visible: false
+            col :associated_id, search: { as: :integer }, visible: false, label: 'Associated Id'
+            col :associated_to_s, search: { as: :string }, label: 'Associated'
+          end
+
+          col :message do |log|
+            log.message.starts_with?("\t") ? log.message.gsub("\t", "&nbsp;&nbsp;") : log.message
+          end
+
+          col :logs_count, visible: false
+
+          col :details, visible: false, sort: false do |log|
+            tableize_hash(log.details.except(:email), th: true, sub_th: false, width: '100%')
+          end
+
+          # unless attributes[:actions] == false
+          #   actions_col partial: 'admin/logs/actions'
+          # end
+        end
+
+        # 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.unscoped.where(parent_id: attributes[:log_id]).includes(:user, :associated)
+
+          if attributes[:log_changes]
+            scope = scope.where(status: EffectiveLogging.log_changes_status)
+          end
+
+          if (attributes[:user] || attributes[:user_id]).present?
+            user_ids = Array(attributes[:user].presence || attributes[:user_id]).map { |user| user.kind_of?(User) ? user.id : user.to_i }
+            scope = scope.where('user_id IN (?) OR (associated_id IN (?) AND associated_type = ?)', user_ids, user_ids, 'User')
+          end
+
+          if attributes[:associated_id] && attributes[:associated_type]
+            scope = scope.where(associated_id: attributes[:associated_id], associated_type: attributes[:associated_type])
+          end
+
+          if attributes[:associated]
+            scope = scope.where(associated: attributes[:associated])
+          end
+
+          scope
+        end
+
+      end
+    end
+  end
+end

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '1.10.4'.freeze
+  VERSION = '1.10.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 1.10.4
+  version: 1.10.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails