effective_logging 1.10.1 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a0761fe17b1a89eae022643b9a8fd78eb8c97ec
-  data.tar.gz: f7fd1e4ab6e62489250fd391e3e391ea055741f1
+  metadata.gz: 4c25bb89ed7d4ea61f1a557b544bc2476d87346a
+  data.tar.gz: c648b6749add1af7a26aa1ae8afc189b90b906b3
 SHA512:
-  metadata.gz: e22222aa91554582ceb840aef218db9ad9cb4df111f1b7a2dfc5092446f4a6d8833bbe235e964618b7c6afa6ab28f434eecc8186d57a234c503fb4fcb66b6444
-  data.tar.gz: 64d75979741116fd9a36f89eb4f3211738684a2a4c37d8ef6d4cbde89db3dec875beaa367cd0e606b50cd94a9d94e2886d9c321d56902c1aa8ca9b27787e3dbf
+  metadata.gz: 9900a5a17e851dae1b6e41a61c73972c29b91108bfb1359a436baa828f00c07e30ddfd46112cb51b145f8e8f9b3852d1d94c83d23cc8e6c3944a54737aeae470
+  data.tar.gz: 0da0a1ce53129cbe60680b5766e7dac74a2710e3ac6295247e0fcb10a1d0aeb1bfecbcb2dcb15333cd39ba22784f48313d7ceb5ce518d3dfe462f4c81de353cb

data/README.md

@@ -261,6 +261,12 @@ First, require the javascript in your application.js:
 //= require effective_logging
 ```
 
+and add the user permission:
+
+```ruby
+can :create, Effective::Log
+```
+
 then logging an event from JavaScript is almost the same one-liner as from ruby:
 
 ```javascript

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

@@ -10,7 +10,13 @@ if defined?(EffectiveDatatables)
           table_column :created_at
           table_column :id, visible: false
 
-          unless attributes[:user_id] || attributes[:user] || (attributes[:user] == false)
+          if attributes[:user] == false
+            # Do not include
+          elsif attributes[:user_id].present?
+            table_column :user, filter: { collection: User.where(id: Array(attributes[:user_id])) }
+          elsif attributes[:user].present?
+            table_column :user, filter: { collection: User.where(id: Array(attributes[:user]).map { |user| user.to_param }) }
+          else
             table_column :user
           end
 
@@ -49,8 +55,8 @@ if defined?(EffectiveDatatables)
           end
 
           if (attributes[:user] || attributes[:user_id]).present?
-            user_id = attributes[:user_id] || (attributes[:user].kind_of?(User) ? attributes[:user].id : attributes[:user].to_i)
-            collection = collection.where('user_id = ? OR (associated_id = ? AND associated_type = ?)', user_id, user_id, 'User')
+            user_ids = Array(attributes[:user].presence || attributes[:user_id]).map { |user| user.kind_of?(User) ? user.id : user.to_i }
+            collection = collection.where('user_id IN (?) OR (associated_id IN (?) AND associated_type = ?)', user_ids, user_ids, 'User')
           end
 
           if attributes[:associated_id] && attributes[:associated_type]

data/app/models/effective/log.rb

@@ -46,6 +46,10 @@ module Effective
       "Log #{id}"
     end
 
+    def message=(msg)
+      write_attribute(:message, msg.kind_of?(String) ? msg.to_s[0...255] : msg)
+    end
+
     def log(message, status = EffectiveLogging.statuses.first, options = {})
       EffectiveLogger.log(message, status, (options || {}).merge(parent: self))
     end

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '1.10.1'.freeze
+  VERSION = '1.10.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.10.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-10 00:00:00.000000000 Z
+date: 2017-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails