Merge pull request #2162 from DanielKuhn/remove-redundant-pageflow-na…

…mespaces Remove redundant pageflow namespaces in admin
codevise · Oct 22, 2024 · 30e8eb4 · 30e8eb4
2 parents 9ef2e68 + b22d50a
commit 30e8eb4
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 20 deletions.
diff --git a/admins/pageflow/accounts.rb b/admins/pageflow/accounts.rb
@@ -67,11 +67,11 @@ module Pageflow
     end
 
     controller do
-      helper Pageflow::Admin::CutoffModesHelper
-      helper Pageflow::Admin::FeaturesHelper
-      helper Pageflow::Admin::FormHelper
-      helper Pageflow::Admin::LocalesHelper
-      helper Pageflow::Admin::MembershipsHelper
+      helper Admin::CutoffModesHelper
+      helper Admin::FeaturesHelper
+      helper Admin::FormHelper
+      helper Admin::LocalesHelper
+      helper Admin::MembershipsHelper
       helper ThemesHelper
 
       def new

diff --git a/admins/pageflow/entry_templates.rb b/admins/pageflow/entry_templates.rb
@@ -12,9 +12,9 @@ module Pageflow
     end
 
     controller do
-      helper Pageflow::Admin::FormHelper
-      helper Pageflow::Admin::WidgetsHelper
-      helper Pageflow::Admin::LocalesHelper
+      helper Admin::FormHelper
+      helper Admin::WidgetsHelper
+      helper Admin::LocalesHelper
 
       def index
         redirect_to redirect_path

diff --git a/admins/pageflow/membership.rb b/admins/pageflow/membership.rb
@@ -80,8 +80,8 @@ module Pageflow
       belongs_to :account, parent_class: Pageflow::Account, polymorphic: true
       belongs_to :user, parent_class: User, polymorphic: true
 
-      helper Pageflow::Admin::MembershipsHelper
-      helper Pageflow::Admin::FormHelper
+      helper Admin::MembershipsHelper
+      helper Admin::FormHelper
 
       def index
         if params[:user_id].present?

diff --git a/admins/pageflow/revisions.rb b/admins/pageflow/revisions.rb
@@ -20,7 +20,7 @@ module Pageflow
     controller do
       include EditLocking
 
-      helper Pageflow::Admin::FormHelper
+      helper Admin::FormHelper
 
       def permitted_params
         params.permit(revision: [:published_until])

diff --git a/admins/pageflow/sites.rb b/admins/pageflow/sites.rb
@@ -35,8 +35,8 @@ module Pageflow
     end
 
     controller do
-      helper Pageflow::Admin::CutoffModesHelper
-      helper Pageflow::Admin::FormHelper
+      helper Admin::CutoffModesHelper
+      helper Admin::FormHelper
 
       before_create do |site|
         site.build_default_permalink_directory

diff --git a/admins/pageflow/translations.rb b/admins/pageflow/translations.rb
@@ -36,7 +36,7 @@ module Pageflow
     end
 
     controller do
-      helper Pageflow::Admin::FormHelper
+      helper Admin::FormHelper
 
       def index
         redirect_to admin_entry_path(parent, tab: 'translations')

diff --git a/admins/pageflow/user.rb b/admins/pageflow/user.rb
@@ -161,12 +161,12 @@ module Pageflow
     end
 
     controller do
-      include Pageflow::QuotaVerification
-      helper Pageflow::Admin::FormHelper
-      helper Pageflow::Admin::LocalesHelper
-      helper Pageflow::Admin::MembershipsHelper
-      helper Pageflow::Admin::UsersHelper
-      helper Pageflow::QuotaHelper
+      include QuotaVerification
+      helper Admin::FormHelper
+      helper Admin::LocalesHelper
+      helper Admin::MembershipsHelper
+      helper Admin::UsersHelper
+      helper QuotaHelper
 
       def scoped_collection
         super.includes(account_memberships: :entity)