avo 2.21.1.pre.issue1444 → 2.21.1.pre.issue1450

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 24cf9486da47ba10e6a5daa1580d555a14c87f9c642a5a8d56d69a9f47784f4e
-  data.tar.gz: e85a3b0a6bc76ba138b523601a64a74539559d919a4c984dc18a7361304527e1
+  metadata.gz: ebf134b0ec573fefe33360ace54658cdaafcf1904a0d88f63e89398f12e34377
+  data.tar.gz: 4c1ccd709c542910c2590e4b508a549463d0777b33e3baff83a63e4c97a834f9
 SHA512:
-  metadata.gz: 34db8a5f063bef99fd6a4cdb5cc72df589e1f0329286ec7f22653de5c96a47788a7c9ad82a7197b11acb90355f9c8f5fd4ba594bf29dace1613d74d31a520917
-  data.tar.gz: 05b2170b8af382365f157c31335b1f913f44a7d5117fe22a1cf6130200362b788812315604e7836570e384a1f2708d58625503aad2fcbbad3a738cb2163ba0f1
+  metadata.gz: e8bb307e086e09eb90b5cbfcddaee9f0f7fd4437ee742a98a0eaeea24171c68828dfa664a0076c332ce9df0955fb931bd3fe34c41941b4988ebe850d2e7cc682
+  data.tar.gz: e8169c3475feda95dcf85a9532c26b7157fe598e9544a033684fa343bb15aac0c68f5da776c7120a61d52dc2816ea84b7ac059444f4520e549aeaa09e694f017

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    avo (2.21.1.pre.issue1444)
+    avo (2.21.1.pre.issue1450)
       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, model: @model)
+      @resource.hydrate(view: action_name.to_sym, user: _current_user)
     end
 
     def hydrate_related_resource
-      @related_resource.hydrate(view: action_name.to_sym, user: _current_user, model: @related_model)
+      @related_resource.hydrate(view: action_name.to_sym, user: _current_user, model: @model)
     end
 
     def authorize_base_action

data/app/controllers/avo/associations_controller.rb

@@ -3,13 +3,12 @@ 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 :set_related_model, only: [:show, :order]
     before_action :hydrate_related_resource, only: [:show, :index, :create, :destroy, :order]
+    before_action :set_related_model, only: [:show, :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_resource: @parent_resource)
+          filter.visible_in_view(resource: @resource, parent_model: @parent_model, 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_resource: @parent_resource)
+          action.visible_in_view(parent_model: @parent_model, parent_resource: @parent_resource)
         end
     end
 

data/lib/avo/base_action.rb

@@ -116,7 +116,7 @@ module Avo
       self
     end
 
-    def visible_in_view(parent_resource: nil)
+    def visible_in_view(parent_model: nil, parent_resource: nil)
       if visible.blank?
         # Hide on the :new view by default
         return false if view == :new
@@ -128,7 +128,9 @@ 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/fields/select_field.rb

@@ -58,7 +58,7 @@ module Avo
 
       # Cache options as options given on block or as options received from arguments
       def options
-        @options ||= if options_from_args.respond_to? :call
+        if options_from_args.respond_to? :call
           options_from_args.call model: model, resource: resource, view: view, field: self
         else
           options_from_args

data/lib/avo/filters/base_filter.rb

@@ -60,13 +60,14 @@ module Avo
         self.class.decode_filters params[PARAM_KEY]
       end
 
-      def visible_in_view(resource: nil, parent_resource: nil)
+      def visible_in_view(resource: nil, parent_model: 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,6 +1,7 @@
 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.21.1.pre.issue1444" unless const_defined?(:VERSION)
+  VERSION = "2.21.1.pre.issue1450" unless const_defined?(:VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: avo
 version: !ruby/object:Gem::Version
-  version: 2.21.1.pre.issue1444
+  version: 2.21.1.pre.issue1450
 platform: ruby
 authors:
 - Adrian Marin
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-26 00:00:00.000000000 Z
+date: 2022-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord