effective_logging 1.10.5 → 1.10.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2de145b956fd6e8284b0176ddb914f149e7e7ddc
-  data.tar.gz: 693cccaee263fde6fd67e186e20c3f44d72c9e22
+  metadata.gz: 4505eb9d63d37917638f060aa88ec3bba0ab1eb7
+  data.tar.gz: 7003902e81dc178bd313135f9a199413380a98ef
 SHA512:
-  metadata.gz: 9834c2c5d1383e9ea216126aa7dd92ee8c04092fcae2f22ec01b2c99e69633c150d88848212a7736d8db528f29998039f18eb932d4e4eb2a79839af959af9727
-  data.tar.gz: 43c2a682dda427c41995f9473ff9bf53a7cb5687f216c69fa321fc1a60a975bdb2745cb99204ac2dd14b1ff2efa8c206e1a67f3a86e486d0f0f609738efa9be8
+  metadata.gz: 022241e504a0616086c903a81dbac1d127ff1f9565a7a1d44338dc6207c061ea5e57fb6d15f08404621ee61b00399ddfed4c2f1f4b0639369e36f45301e62f54
+  data.tar.gz: 286cec2bbe861908b2f6279b404342ca145ede8733b5a80e77bd6dc9b39fe3eb5caa6f80ac18815a056511da2358263312649bf032588e8d03a3c306c750d04f

data/app/controllers/admin/logs_controller.rb

@@ -8,7 +8,12 @@ module Admin
     helper EffectiveLoggingHelper
 
     def index
-      @datatable = Effective::Datatables::Logs.new()
+      if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
+        @datatable = Effective::Datatables::Logs.new()
+      else
+        @datatable = EffectiveLogsDatatable.new(self)
+      end
+
       @page_title = 'Logs'
 
       EffectiveLogging.authorized?(self, :index, Effective::Log)
@@ -23,7 +28,11 @@ module Admin
       @page_title = "Log ##{@log.to_param}"
 
       if @log.logs.present?
-        @log.datatable = Effective::Datatables::Logs.new(log_id: @log.id) if defined?(EffectiveDatatables)
+        if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
+          @log.datatable = Effective::Datatables::Logs.new(log_id: @log.id)
+        else
+          @log.datatable = EffectiveLogsDatatable.new(self, log_id: @log.id)
+        end
       end
 
       EffectiveLogging.authorized?(self, :show, @log)

data/app/controllers/effective/logs_controller.rb

@@ -39,8 +39,11 @@ module Effective
 
     # This is the User index event
     def index
-      @datatable = Effective::Datatables::Logs.new(user_id: current_user.id)
-      @page_title = 'My Activity'
+      if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
+        @datatable = Effective::Datatables::Logs.new(user_id: current_user.id)
+      else
+        @datatable = EffectiveLogsDatatable.new(self, user_id: current_user.id)
+      end
 
       EffectiveLogging.authorized?(self, :index, Effective::Log.new(user_id: current_user.id))
     end
@@ -54,7 +57,11 @@ module Effective
       @page_title = "Log ##{@log.to_param}"
 
       if @log.logs.present?
-        @log.datatable = Effective::Datatables::Logs.new(log_id: @log.id) if defined?(EffectiveDatatables)
+        if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
+          @log.datatable = Effective::Datatables::Logs.new(log_id: @log.id)
+        else
+          @log.datatable = EffectiveLogsDatatable.new(self, log_id: @log.id)
+        end
       end
 
       EffectiveLogging.authorized?(self, :show, @log)

data/app/datatables/effective_logs_datatable.rb

@@ -0,0 +1,68 @@
+unless Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
+  class EffectiveLogsDatatable < Effective::Datatable
+    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
+
+      actions_col partial: 'admin/logs/actions', partial_as: :log
+    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

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

@@ -1,4 +1,4 @@
-if defined?(EffectiveDatatables) && Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
+if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
   module Effective
     module Datatables
       class Logs < Effective::Datatable
@@ -74,80 +74,3 @@ if defined?(EffectiveDatatables) && Gem::Version.new(EffectiveDatatables::VERSIO
     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/app/views/admin/logs/_actions.html.haml

@@ -1,8 +1,6 @@
 :ruby
   show_path =
-    if datatables_active_admin_path?
-      admin_effective_log_path(log)
-    elsif datatables_admin_path?
+    if datatable.try(:admin_namespace?)
       effective_logging.admin_log_path(log)
     else
       effective_logging.log_path(log)

data/app/views/effective/logs/_log.html.haml

@@ -1,18 +1,14 @@
 .panel{:class => "panel-#{bootstrap_class_for_status(log.status)}"}
   .panel-heading
-    - parents_of_log(log).each do |parent|
-      = link_to(log.message, (request.fullpath.gsub(log.to_param, parent.to_param) rescue '#'))
-      = ' > '
-    %strong= log.message
-    .pull-right
-      - if log.prev_log.present?
-        = link_to '< Prev', request.fullpath.gsub(log.to_param, log.prev_log.try(:to_param).to_s)
-
-      - if log.prev_log && log.next_log
-        = ' - '
-
-      - if log.next_log.present?
-        = link_to 'Next >', request.fullpath.gsub(log.to_param, log.next_log.try(:to_param).to_s)
+    .row
+      .col-sm-10
+        - parents_of_log(log).each do |parent|
+          = link_to(log.message, (request.fullpath.gsub(log.to_param, parent.to_param) rescue '#'))
+          = ' > '
+        %p= log.message
+      .col-sm-2.text-right
+        = link_to 'Prev', request.fullpath.gsub(log.to_param, log.prev_log.try(:to_param).to_s), class: 'btn btn-default', disabled: log.prev_log.blank?
+        = link_to 'Next', request.fullpath.gsub(log.to_param, log.next_log.try(:to_param).to_s), class: 'btn btn-default', disabled: log.next_log.blank?
 
   .panel-body
     .row

data/lib/effective_logging/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 1.10.5
+  version: 1.10.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-27 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,6 +108,7 @@ files:
 - app/assets/javascripts/effective_logging/effective_logger.js.coffee.erb
 - app/controllers/admin/logs_controller.rb
 - app/controllers/effective/logs_controller.rb
+- app/datatables/effective_logs_datatable.rb
 - app/helpers/effective_logging_helper.rb
 - app/models/concerns/acts_as_loggable.rb
 - app/models/effective/access_denied.rb