avo 2.20.0 → 2.21.1.pre.issue1444

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 032f3c926677645e9939a30205693425f4c44c4db874d7e30849c600e13be8a1
-  data.tar.gz: 110d46843bf447a9e1a1215e3d4e17e4c8bf64ca4f88889d72a504c6b9cef06e
+  metadata.gz: 24cf9486da47ba10e6a5daa1580d555a14c87f9c642a5a8d56d69a9f47784f4e
+  data.tar.gz: e85a3b0a6bc76ba138b523601a64a74539559d919a4c984dc18a7361304527e1
 SHA512:
-  metadata.gz: feed3402af12295a712d16f45ced2248c6fcb0663cdad1d4e3b160f9d706e26322ce2966f64f1f6d0fe622f13f2019be8b12d8c16afa7f009ddefe175fd0a7f5
-  data.tar.gz: 28c50de8194d7c649b2c629c988511f1470b00dbaa5d7a60013f743959fecff0b7e97e5c5383548552e412bdea05b9224910c38d681ddbefea25116ade529145
+  metadata.gz: 34db8a5f063bef99fd6a4cdb5cc72df589e1f0329286ec7f22653de5c96a47788a7c9ad82a7197b11acb90355f9c8f5fd4ba594bf29dace1613d74d31a520917
+  data.tar.gz: 05b2170b8af382365f157c31335b1f913f44a7d5117fe22a1cf6130200362b788812315604e7836570e384a1f2708d58625503aad2fcbbad3a738cb2163ba0f1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.20.0)
+    avo (2.21.1.pre.issue1444)
       actionview (>= 6.0)
       active_link_to
       activerecord (>= 6.0)

data/app/controllers/avo/application_controller.rb

@@ -172,11 +172,11 @@ module Avo
     end
 
     def hydrate_resource
-      @resource.hydrate(view: action_name.to_sym, user: _current_user)
+      @resource.hydrate(view: action_name.to_sym, user: _current_user, model: @model)
     end
 
     def hydrate_related_resource
-      @related_resource.hydrate(view: action_name.to_sym, user: _current_user, model: @model)
+      @related_resource.hydrate(view: action_name.to_sym, user: _current_user, model: @related_model)
     end
 
     def authorize_base_action

data/app/controllers/avo/associations_controller.rb

@@ -3,12 +3,13 @@ require_dependency "avo/base_controller"
 module Avo
   class AssociationsController < BaseController
     before_action :set_model, only: [:show, :index, :new, :create, :destroy, :order]
+    before_action :hydrate_resource, only: [:show, :index, :new, :create, :destroy, :order]
     before_action :set_related_resource_name
     before_action :set_related_resource, only: [:show, :index, :new, :create, :destroy, :order]
     before_action :set_related_authorization
     before_action :set_reflection_field
-    before_action :hydrate_related_resource, only: [:show, :index, :create, :destroy, :order]
     before_action :set_related_model, only: [:show, :order]
+    before_action :hydrate_related_resource, only: [:show, :index, :create, :destroy, :order]
     before_action :set_reflection
     before_action :set_attachment_class, only: [:show, :index, :new, :create, :destroy, :order]
     before_action :set_attachment_resource, only: [:show, :index, :new, :create, :destroy, :order]

data/app/controllers/avo/base_controller.rb

@@ -315,7 +315,7 @@ module Avo
           filter[:class].new arguments: filter[:arguments]
         end
         .select do |filter|
-          filter.visible_in_view(resource: @resource, parent_model: @parent_model, parent_resource: @parent_resource)
+          filter.visible_in_view(resource: @resource, parent_resource: @parent_resource)
         end
     end
 
@@ -326,7 +326,7 @@ module Avo
           action[:class].new(model: @model, resource: @resource, view: @view, arguments: action[:arguments])
         end
         .select do |action|
-          action.visible_in_view(parent_model: @parent_model, parent_resource: @parent_resource)
+          action.visible_in_view(parent_resource: @parent_resource)
         end
     end
 

data/config/master.key

@@ -0,0 +1 @@
+2aeb23d82b909d9c6b5abb62f7058c2a

data/lib/avo/base_action.rb

@@ -116,7 +116,7 @@ module Avo
       self
     end
 
-    def visible_in_view(parent_model: nil, parent_resource: nil)
+    def visible_in_view(parent_resource: nil)
       if visible.blank?
         # Hide on the :new view by default
         return false if view == :new
@@ -128,9 +128,7 @@ module Avo
       # Run the visible block if available
       Avo::Hosts::VisibilityHost.new(
         block: visible,
-        model: self.class.model,
         params: params,
-        parent_model: parent_model,
         parent_resource: parent_resource,
         resource: self.class.resource,
         view: self.class.view,

data/lib/avo/filters/base_filter.rb

@@ -60,14 +60,13 @@ module Avo
         self.class.decode_filters params[PARAM_KEY]
       end
 
-      def visible_in_view(resource: nil, parent_model: nil, parent_resource: nil)
+      def visible_in_view(resource: nil, parent_resource: nil)
         return true if visible.blank?
 
         # Run the visible block if available
         Avo::Hosts::VisibilityHost.new(
           block: visible,
           params: params,
-          parent_model: parent_model,
           parent_resource: parent_resource,
           resource: resource,
           arguments: arguments

data/lib/avo/hosts/visibility_host.rb

@@ -1,7 +1,6 @@
 module Avo
   module Hosts
     class VisibilityHost < BaseHost
-      option :parent_model
       option :parent_resource
       option :resource
       option :arguments

data/lib/avo/version.rb

@@ -1,3 +1,3 @@
 module Avo
-  VERSION = "2.20.0" unless const_defined?(:VERSION)
+  VERSION = "2.21.1.pre.issue1444" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.20.0
+  version: 2.21.1.pre.issue1444
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-22 00:00:00.000000000 Z
+date: 2022-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -1694,6 +1694,7 @@ files:
 - config/credentials.yml.enc
 - config/i18n-tasks.yml
 - config/initializers/pagy.rb
+- config/master.key
 - config/routes.rb
 - config/spring.rb
 - db/factories.rb
@@ -1944,9 +1945,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.3
 signing_key: