effective_trash 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d48b6ae4a747e8d6d2567827966736aff26b6b53
-  data.tar.gz: e4eb0078becab79191be39d8bb2b0d94159e43f7
+  metadata.gz: 74550c4d1c0f1e096e3fa84cab3e66cd2599b60f
+  data.tar.gz: 6348841841f51fda296e4b5074abbb188424f4ab
 SHA512:
-  metadata.gz: 0ff0bc35b9b92526df5bd06991f872f57a5a831779524774490e353160f9cc06c7ed6e46077e4d284d3af8e5a3ace5f5a47d814f540eec77c52a40998b5f9dd1
-  data.tar.gz: 208dfa88a8522b943c9135e138a5040ce58916bc2ac21e11bb6609145e20e047244562847fa833e9690896a271a63d2778831d62159fd5f9c265e7e1f1538dfd
+  metadata.gz: c69bd045b99ff0b940a5e9d4a344d2d885220ad4515b7e6747b8f90b9fc15856ac0f7271b150f44c5f74eea005528cd154566f2e8b27ee1137c2cd5da8d8eae5
+  data.tar.gz: cd3e883e13314508164b627f661d4d705a7017ab4a6e02d3e028c4ab0daea0ec9815d2da7429a4d42799862387debcd8594d48128ed6554cdd687c5065f8806e

data/app/controllers/admin/trash_controller.rb

@@ -9,7 +9,12 @@ module Admin
     helper EffectiveTrashHelper
 
     def index
-      @datatable = Effective::Datatables::Trash.new()
+      if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
+        @datatable = Effective::Datatables::Trash.new
+      else
+        @datatable = EffectiveTrashDatatable.new(self)
+      end
+
       @page_title = 'Trash'
 
       EffectiveTrash.authorized?(self, :index, Effective::Trash)

data/app/controllers/effective/trash_controller.rb

@@ -8,7 +8,13 @@ module Effective
 
     # This is the User index event
     def index
-      @datatable = Effective::Datatables::Trash.new(user_id: current_user.id)
+
+      if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
+        @datatable = Effective::Datatables::Trash.new(user_id: current_user.id)
+      else
+        @datatable = EffectiveTrashDatatable.new(self, user_id: current_user.id)
+      end
+
       @page_title = 'Trash'
 
       EffectiveTrash.authorized?(self, :index, Effective::Trash.new(user_id: current_user.id))

data/app/datatables/effective_trash_datatable.rb

@@ -0,0 +1,47 @@
+unless Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
+  class EffectiveTrashDatatable < Effective::Datatable
+    datatable do
+      order :created_at, :desc
+
+      col :created_at, label: 'Destroyed at'
+      col :id, visible: false
+
+      unless attributes[:user_id] || attributes[:user] || (attributes[:user] == false)
+        col :user, label: 'Destroyed by'
+      end
+
+      col :trashed_type, label: 'Type'
+      col :trashed_id, label: 'Original Id', visible: false
+      col :trashed_to_s, label: 'Item'
+
+      col :details, visible: false do |trash|
+        tableize_hash(trash.details, th: true, sub_th: false, width: '100%')
+      end
+
+      unless attributes[:actions] == false
+        actions_col partial: 'admin/trash/actions', partial_as: :trash
+      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 trash
+    collection do
+      collection = Effective::Trash.all.includes(:user)
+
+      if attributes[:user_id].present?
+        collection = collection.where(user_id: attributes[:user_id])
+      end
+
+      if attributes[:user].present?
+        collection = collection.where(user: attributes[:user])
+      end
+
+      if attributes[:trashed_id] && attributes[:trashed_type]
+        collection = collection.where(trashed_id: attributes[:trashed_id], trashed_type: attributes[:trashed_type])
+      end
+
+      collection
+    end
+
+  end
+end

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

@@ -1,4 +1,4 @@
-if defined?(EffectiveDatatables)
+if Gem::Version.new(EffectiveDatatables::VERSION) < Gem::Version.new('3.0')
   module Effective
     module Datatables
       class Trash < Effective::Datatable

data/app/views/admin/trash/_actions.html.haml

@@ -1,7 +1,7 @@
 :ruby
   show_path =
-    if datatables_active_admin_path?
-      admin_effective_trash_path(trash)
+    if datatable.try(:admin_namespace?)
+      effective_trash.admin_trash_path(trash)
     elsif datatables_admin_path?
       effective_trash.admin_trash_path(trash)
     else

data/lib/effective_trash/version.rb

@@ -1,3 +1,3 @@
 module EffectiveTrash
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.2.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_trash
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,6 +105,7 @@ files:
 - README.md
 - app/controllers/admin/trash_controller.rb
 - app/controllers/effective/trash_controller.rb
+- app/datatables/effective_trash_datatable.rb
 - app/helpers/effective_trash_helper.rb
 - app/models/concerns/acts_as_trashable.rb
 - app/models/effective/access_denied.rb