From 26c1a87695dbd56d3604e1028fb0502b8d2b0340 Mon Sep 17 00:00:00 2001 From: Joshua Wehner Date: Tue, 25 Jul 2023 10:41:15 -0400 Subject: [PATCH] Address minimal_admin deprecation (#19807) * minimal_admin deprecation * Remove the deprecate and aliases --- app/policies/application_policy.rb | 6 ------ app/policies/html_variant_policy.rb | 12 ++++++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/app/policies/application_policy.rb b/app/policies/application_policy.rb index 5eb1dc112..6bdbea0f8 100644 --- a/app/policies/application_policy.rb +++ b/app/policies/application_policy.rb @@ -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 diff --git a/app/policies/html_variant_policy.rb b/app/policies/html_variant_policy.rb index 28a013368..22d25ab97 100644 --- a/app/policies/html_variant_policy.rb +++ b/app/policies/html_variant_policy.rb @@ -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]