rails_admin 1.4.3 → 2.0.0

data/lib/rails_admin/extensions/paper_trail/auditing_adapter.rb

@@ -112,22 +112,37 @@ module RailsAdmin
             sort_reverse = 'true'
           end
 
-          ar_model = model.model
           current_page = page.presence || '1'
 
-          versions = version_class_for(ar_model).where item_type: ar_model.name
-          versions = versions.where item_id: object.id if object
+          versions = object.nil? ? versions_for_model(model) : object.versions
           versions = versions.where('event LIKE ?', "%#{query}%") if query.present?
           versions = versions.order(sort_reverse == 'true' ? "#{sort} DESC" : sort)
           versions = all ? versions : versions.send(Kaminari.config.page_method_name, current_page).per(per_page)
           paginated_proxies = Kaminari.paginate_array([], total_count: versions.try(:total_count) || versions.count)
-          paginated_proxies = paginated_proxies.page(current_page).per(per_page)
+          paginated_proxies = paginated_proxies.send(
+            paginated_proxies.respond_to?(Kaminari.config.page_method_name) ? Kaminari.config.page_method_name : :page,
+            current_page,
+          ).per(per_page)
           versions.each do |version|
             paginated_proxies << VersionProxy.new(version, @user_class)
           end
           paginated_proxies
         end
 
+        def versions_for_model(model)
+          model_name = model.model.name
+          base_class_name = model.model.base_class.name
+
+          options =
+            if base_class_name == model_name
+              {item_type: model_name}
+            else
+              {item_type: base_class_name, item_id: model.model.all}
+            end
+
+          version_class_for(model.model).where(options)
+        end
+
         # PT can be configured to use [custom version
         # classes](https://github.com/paper-trail-gem/paper_trail#6a-custom-version-classes)
         #

data/lib/rails_admin/version.rb

@@ -1,8 +1,8 @@
 module RailsAdmin
   class Version
-    MAJOR = 1
-    MINOR = 4
-    PATCH = 3
+    MAJOR = 2
+    MINOR = 0
+    PATCH = 0
     PRE = nil
 
     class << self

data/lib/rails_admin.rb

@@ -2,7 +2,6 @@ require 'rails_admin/engine'
 require 'rails_admin/abstract_model'
 require 'rails_admin/config'
 require 'rails_admin/extension'
-require 'rails_admin/extensions/cancan'
 require 'rails_admin/extensions/cancancan'
 require 'rails_admin/extensions/pundit'
 require 'rails_admin/extensions/paper_trail'