rails_admin_next 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab5a6bc8f57c396848dea3a851d668da3604777f07674304de1b2eaab84074df
-  data.tar.gz: 4b695b8d7a86cebf28db86e4f2730bfc081bfccb480c2279fb9fd8329407643f
+  metadata.gz: 50219c685864a241e7cca2ff03fbd7c0d8e7c3c9a1f49e65bb19b73f15924525
+  data.tar.gz: 37808fdd9c7012a71cd5e6973102dc0b3baf2c2fb7778a4c2eb0421ca4df585a
 SHA512:
-  metadata.gz: 4b665f2830ea9086fcae2e1ba66c83b5dcd2000f4ebf1652fb161dccdfcf04d6353d17453ba26f3590a2e73d4cca54106fbb2fbe86a80c2e1d4da9fa0a4386fd
-  data.tar.gz: bf1a98c7a6f8e14106f9460c1467099ef8c4a99755ffcc847b9d3f60364a9a9f03ad4f3e89781b60e5718df41654a7b7bb6c772b5b5350a9d29b0e1e2a0a7771
+  metadata.gz: 9a85fc8b87439b96f6910ec47d197d35d889dd4da565138982e25db0f039b7cbcef93178b98dae160f29ee8c701f7d3d58c827f85dc8b7172b8107536ac62f2b
+  data.tar.gz: d6b0b230e6ee33e864b9242fcff419197cc52e24220a007b0743585388ec96261c8bdb22b3384e2e79338d445cca4d26d4a4e7dd53f36ad48e1778a8179790ff

data/app/controllers/rails_admin_next/application_controller.rb

@@ -24,7 +24,7 @@ module RailsAdminNext
 
     helper_method :_current_user
 
-    attr_reader :object, :model_config, :abstract_model, :authorization_adapter
+    attr_reader :object, :model_config, :abstract_model, :auditing_adapter, :authorization_adapter
 
     # nil without an authorization adapter. With one, a scope that is not a relation (nil, a
     # Hash, a Proc, an Array) comes from a broken policy and lists nothing: merged in, most of

data/docs/UPGRADING.md

@@ -913,3 +913,13 @@ A `last_created_at` override in model config is not scoped for you. It runs with
 `bindings[:controller].authorization_scope(:index, abstract_model)`: the authorized relation, an
 empty one when the policy scope is broken, or `nil` without an authorization adapter. Calling the
 adapter's `query` directly skips that check.
+
+## History is hidden for a model PaperTrail does not version
+
+With `config.audit_with :paper_trail`, a model without `has_paper_trail` no longer shows History
+links, and its history pages list no versions. They used to fail with `NoMethodError`.
+
+An auditing adapter may define `auditable?(abstract_model)`. When it answers false, the
+`history_index` and `history_show` actions are hidden for that model. A custom adapter that does
+not define it keeps the History links on every model, as before. A `visible` block you configure
+on either history action replaces this check.

data/lib/rails_admin_next/config/actions/base.rb

@@ -58,6 +58,11 @@ module RailsAdminNext
           )
         end
 
+        def auditable?
+          adapter = bindings[:controller].try(:auditing_adapter)
+          bindings[:abstract_model].nil? || !adapter.respond_to?(:auditable?) || adapter.auditable?(bindings[:abstract_model])
+        end
+
         # Is the action acting on the root level (Example: /admin/contact)
         register_instance_option :root? do
           false

data/lib/rails_admin_next/config/actions/history_index.rb

@@ -14,6 +14,10 @@ module RailsAdminNext
           true
         end
 
+        register_instance_option :visible? do
+          authorized? && auditable?
+        end
+
         register_instance_option :route_fragment do
           "history"
         end

data/lib/rails_admin_next/config/actions/history_show.rb

@@ -14,6 +14,10 @@ module RailsAdminNext
           true
         end
 
+        register_instance_option :visible? do
+          authorized? && auditable?
+        end
+
         register_instance_option :route_fragment do
           "history"
         end

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

@@ -114,6 +114,12 @@ module RailsAdminNext
             .collect { |version| VersionProxy.new(version, user_class) }
         end
 
+        # Optional in the auditing adapter contract: the history actions hide themselves for a model
+        # whose adapter answers false, and stay visible for an adapter that does not define it.
+        def auditable?(abstract_model)
+          versioned?(abstract_model.model)
+        end
+
         def delete_object(_object, _model, _user)
           # do nothing
         end
@@ -146,7 +152,11 @@ module RailsAdminNext
               sort_by
             end
 
-          versions = object.nil? ? versions_for_model(model, scope) : object.public_send(model.model.versions_association_name)
+          versions =
+            if !auditable?(model) then version_class.none
+            elsif object.nil? then versions_for_model(model, scope)
+            else object.public_send(model.model.versions_association_name)
+            end
           versions = versions.where("event LIKE ?", "%#{query}%") if query.present?
           versions = versions.reorder(sort)
 

data/lib/rails_admin_next/version.rb

@@ -7,7 +7,7 @@ module RailsAdminNext
     # the floor a local `gem build` produces.
     MAJOR = 3
     MINOR = 0
-    PATCH = 1
+    PATCH = 2
     PRE = nil
 
     class << self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_next
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Daniel López Prat