models_auditor 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b97d84628732df40bbcf5f795dab1cb0def7099c
-  data.tar.gz: 0588d971945a2c86b6abb775d3a88db96eb31db8
+  metadata.gz: 798b2ce9bbeff3dcf829c00e38160fe960e4a859
+  data.tar.gz: 413c51cb3cd244947eaaa018a2888b8a0ec11b78
 SHA512:
-  metadata.gz: 305e685e80a2671aed2d00038287cc7acb3808f389cd5ea858192ff64dc1e8913d11fb90a1959b72b48501a0d580bda57210430c14e7bc1af36f5bb7162dfe89
-  data.tar.gz: d8fc089476d78eee2cff0adcd8a77f06813ef597f32913146229c7a334944a1f5d341e452b0157048564eeaed9d770ee73a1024f0959d3b4898d4ff2ddae22c3
+  metadata.gz: dc1360fbfa0a78fca9217e99610a56e121e6efcea0e617356e4ed01148586d6c29a30612bd225917efc8c7a2da846ce4b0d4827d115ecc525d8850db2e1fe8e4
+  data.tar.gz: f872f90f9657606ee1be07db44673172e05af11b11c90a75c4af2a802816cdf84e336df39870d4242748448a062f8f95958a8d1a37cc9db34d60df31b6164eb3

data/app/controllers/models_auditor/audit_controller.rb

@@ -12,7 +12,7 @@ module ModelsAuditor
 
       @collection =
         ModelsAuditor::AuditRequest.includes(:records).all
-          .order(created_at: :desc)
+          .order("#{ModelsAuditor::AuditRequest.table_name}.created_at DESC")
           .paginate(paginate_info)
 
       @collection = apply_filters(@collection, params[:filters])
@@ -40,21 +40,23 @@ module ModelsAuditor
 
     def apply_filters(collection, filters)
       return collection if filters.blank? || collection.nil?
+      original = collection
       if filters[:since_at].present? && (time = (Time.parse(filters[:since_at]) rescue nil)).present?
         collection =
           collection
+            .includes(:records)
             .where(ModelsAuditor::AuditRecord.arel_table[:created_at].gteq(time))
             .references(ModelsAuditor::AuditRecord.table_name.to_sym)
       end
       if filters[:before_at].present? && (time = (Time.parse(filters[:before_at]) rescue nil)).present?
         collection =
           collection
+            .includes(:records)
             .where(ModelsAuditor::AuditRecord.arel_table[:created_at].lteq(time))
             .references(ModelsAuditor::AuditRecord.table_name.to_sym)
       end
       if filters[:action].present?
-        collection = collection.where(ModelsAuditor::AuditRecord.arel_table[:action].eq(ModelsAuditor::AuditRecord.actions[filters[:action]])).references(ModelsAuditor::AuditRecord.table_name.to_sym)
-
+        collection = collection.includes(:records).where(ModelsAuditor::AuditRecord.arel_table[:action].eq(ModelsAuditor::AuditRecord.actions[filters[:action]])).references(ModelsAuditor::AuditRecord.table_name.to_sym)
       end
       if filters[:user_id].present?
         collection = collection.where(user_id: filters[:user_id])
@@ -68,11 +70,11 @@ module ModelsAuditor
           cond[:object_type] = object_type
         end
 
-        filtered_requests = collection.where(ModelsAuditor::AuditRecord.table_name.to_sym => cond).pluck(:id)
-        collection        = collection.where(id: filtered_requests)
+        collection = collection.includes(:records).where(ModelsAuditor::AuditRecord.table_name.to_sym => cond)
       end
 
-      collection
+      filtered_requests = collection.pluck(:id)
+      original.where(id: filtered_requests)
     end
 
     def get_relations(record, records)

data/lib/models_auditor/version.rb

@@ -1,3 +1,3 @@
 module ModelsAuditor
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: models_auditor
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Alexander Gorbunov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2016-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails