diff --git a/app/controllers/concerns/administrate/punditize.rb b/app/controllers/concerns/administrate/punditize.rb index 41c81ef03..9a3841985 100644 --- a/app/controllers/concerns/administrate/punditize.rb +++ b/app/controllers/concerns/administrate/punditize.rb @@ -9,31 +9,27 @@ module Punditize include Pundit end - included do - private - - def policy_namespace - [] - end + private - def scoped_resource - namespaced_scope = policy_namespace + [super] - policy_scope!(pundit_user, namespaced_scope) - end + def policy_namespace + [] + end - def authorize_resource(resource) - namespaced_resource = policy_namespace + [resource] - authorize namespaced_resource - end + def scoped_resource + namespaced_scope = policy_namespace + [super] + policy_scope!(pundit_user, namespaced_scope) + end - def authorized_action?(resource, action) - namespaced_resource = policy_namespace + [resource] - policy = Pundit.policy!(pundit_user, namespaced_resource) - policy.send("#{action}?".to_sym) - end + def authorize_resource(resource) + namespaced_resource = policy_namespace + [resource] + authorize namespaced_resource end - private + def authorized_action?(resource, action) + namespaced_resource = policy_namespace + [resource] + policy = Pundit.policy!(pundit_user, namespaced_resource) + policy.send("#{action}?".to_sym) + end def policy_scope!(user, scope) policy_scope_class = Pundit::PolicyFinder.new(scope).scope!