maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Address minimal_admin deprecation (#19807)

Browse source 
* minimal_admin deprecation

* Remove the deprecate and aliases
This commit is contained in:
Joshua Wehner 2023-07-25 10:41:15 -04:00 • committed by GitHub
parent 869f29d942
commit 26c1a87695
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/policies/application_policy.rb
View file

@ -201,12 +201,6 @@ class ApplicationPolicy
delegate :super_moderator?, :super_admin?, :any_admin?, :suspended?, to: :user, prefix: true
alias minimal_admin? user_any_admin?
deprecate minimal_admin?: "Deprecating #{self}#minimal_admin?, use #{self}#user_any_admin?"
alias user_admin? user_super_admin?
deprecate minimal_admin?: "Deprecating #{self}#user_admin?, use #{self}#user_super_admin?"
def user_trusted?
user.has_trusted_role?
end

12
app/policies/html_variant_policy.rb
View file

@ -3,17 +3,17 @@ class HtmlVariantPolicy < ApplicationPolicy
user_any_admin?
end
alias show? minimal_admin?
alias show? user_any_admin?
alias edit? minimal_admin?
alias edit? user_any_admin?
alias update? minimal_admin?
alias update? user_any_admin?
alias new? minimal_admin?
alias new? user_any_admin?
alias create? minimal_admin?
alias create? user_any_admin?
alias destroy? minimal_admin?
alias destroy? user_any_admin?
def permitted_attributes
%i[html name published approved target_tag group]