Make all controllers use new Admin::ResourceController

2026-03-04 02:31:33 +00:00 · 2020-10-31 10:39:58 +00:00
parent c63d99dd20
commit 0fb9f44dda
33 changed files with 34 additions and 34 deletions
--- a/app/controllers/admin/column_preferences_controller.rb
+++ b/app/controllers/admin/column_preferences_controller.rb
@@ -1,5 +1,5 @@
 module Admin
-  class ColumnPreferencesController < ResourceController
+  class ColumnPreferencesController < Admin::ResourceController
    before_action :load_collection, only: [:bulk_update]

    respond_to :json
--- a/app/controllers/admin/customers_controller.rb
+++ b/app/controllers/admin/customers_controller.rb
@@ -42,7 +42,7 @@ module Admin
      end
    end

-    # copy of Spree::Admin::ResourceController without flash notice
+    # copy of Admin::ResourceController without flash notice
    def destroy
      invoke_callbacks(:destroy, :before)
      if @object.destroy
@@ -95,7 +95,7 @@ module Admin
      )
    end

-    # Used in ResourceController#update
+    # Used in Admin::ResourceController#update
    def permitted_resource_params
      customer_params
    end
--- a/app/controllers/admin/enterprise_fees_controller.rb
+++ b/app/controllers/admin/enterprise_fees_controller.rb
@@ -1,5 +1,5 @@
 module Admin
-  class EnterpriseFeesController < ResourceController
+  class EnterpriseFeesController < Admin::ResourceController
    before_action :load_enterprise_fee_set, only: :index
    before_action :load_data

--- a/app/controllers/admin/enterprise_groups_controller.rb
+++ b/app/controllers/admin/enterprise_groups_controller.rb
@@ -1,5 +1,5 @@
 module Admin
-  class EnterpriseGroupsController < ResourceController
+  class EnterpriseGroupsController < Admin::ResourceController
    before_action :load_data, except: :index
    before_action :load_object_data, only: [:new, :edit, :create, :update]

--- a/app/controllers/admin/enterprise_relationships_controller.rb
+++ b/app/controllers/admin/enterprise_relationships_controller.rb
@@ -1,5 +1,5 @@
 module Admin
-  class EnterpriseRelationshipsController < ResourceController
+  class EnterpriseRelationshipsController < Admin::ResourceController
    def index
      @my_enterprises = Enterprise.
        includes(:shipping_methods, :payment_methods).
--- a/app/controllers/admin/enterprise_roles_controller.rb
+++ b/app/controllers/admin/enterprise_roles_controller.rb
@@ -1,5 +1,5 @@
 module Admin
-  class EnterpriseRolesController < ResourceController
+  class EnterpriseRolesController < Admin::ResourceController
    def index
      @enterprise_roles = EnterpriseRole.by_user_email
      @users = Spree::User.order('spree_users.email')
--- a/app/controllers/admin/enterprises_controller.rb
+++ b/app/controllers/admin/enterprises_controller.rb
@@ -326,7 +326,7 @@ module Admin
      )
    end

-    # Used in ResourceController#create
+    # Used in Admin::ResourceController#create
    def permitted_resource_params
      enterprise_params
    end
--- a/app/controllers/admin/inventory_items_controller.rb
+++ b/app/controllers/admin/inventory_items_controller.rb
@@ -1,5 +1,5 @@
 module Admin
-  class InventoryItemsController < ResourceController
+  class InventoryItemsController < Admin::ResourceController
    respond_to :json

    respond_override update: { json: {
--- a/app/controllers/admin/order_cycles_controller.rb
+++ b/app/controllers/admin/order_cycles_controller.rb
@@ -1,5 +1,5 @@
 module Admin
-  class OrderCyclesController < ResourceController
+  class OrderCyclesController < Admin::ResourceController
    include OrderCyclesHelper
    include PaperTrailLogging

--- a/app/controllers/admin/producer_properties_controller.rb
+++ b/app/controllers/admin/producer_properties_controller.rb
@@ -1,5 +1,5 @@
 module Admin
-  class ProducerPropertiesController < ResourceController
+  class ProducerPropertiesController < Admin::ResourceController
    before_action :load_enterprise
    before_action :load_properties
    before_action :setup_property, only: [:index]
--- a/app/controllers/admin/proxy_orders_controller.rb
+++ b/app/controllers/admin/proxy_orders_controller.rb
@@ -1,5 +1,5 @@
 module Admin
-  class ProxyOrdersController < ResourceController
+  class ProxyOrdersController < Admin::ResourceController
    respond_to :json

    def edit
--- a/app/controllers/admin/schedules_controller.rb
+++ b/app/controllers/admin/schedules_controller.rb
@@ -2,7 +2,7 @@ require 'open_food_network/permissions'
 require 'order_management/subscriptions/proxy_order_syncer'

 module Admin
-  class SchedulesController < ResourceController
+  class SchedulesController < Admin::ResourceController
    include PaperTrailLogging

    before_action :adapt_params, only: [:update]
--- a/app/controllers/admin/subscription_line_items_controller.rb
+++ b/app/controllers/admin/subscription_line_items_controller.rb
@@ -3,7 +3,7 @@ require 'open_food_network/order_cycle_permissions'
 require 'open_food_network/scope_variant_to_hub'

 module Admin
-  class SubscriptionLineItemsController < ResourceController
+  class SubscriptionLineItemsController < Admin::ResourceController
    before_action :load_build_context, only: [:build]
    before_action :ensure_shop, only: [:build]
    before_action :ensure_variant, only: [:build]
--- a/app/controllers/admin/subscriptions_controller.rb
+++ b/app/controllers/admin/subscriptions_controller.rb
@@ -1,7 +1,7 @@
 require 'open_food_network/permissions'

 module Admin
-  class SubscriptionsController < ResourceController
+  class SubscriptionsController < Admin::ResourceController
    before_action :load_shops, only: [:index]
    before_action :load_form_data, only: [:new, :edit]
    before_action :strip_banned_attrs, only: [:update]
--- a/app/controllers/admin/tag_rules_controller.rb
+++ b/app/controllers/admin/tag_rules_controller.rb
@@ -1,5 +1,5 @@
 module Admin
-  class TagRulesController < ResourceController
+  class TagRulesController < Admin::ResourceController
    respond_to :json

    respond_override destroy: { json: {
--- a/app/controllers/admin/variant_overrides_controller.rb
+++ b/app/controllers/admin/variant_overrides_controller.rb
@@ -1,7 +1,7 @@
 require 'open_food_network/spree_api_key_loader'

 module Admin
-  class VariantOverridesController < ResourceController
+  class VariantOverridesController < Admin::ResourceController
    include OpenFoodNetwork::SpreeApiKeyLoader
    include EnterprisesHelper

--- a/app/controllers/spree/admin/adjustments_controller.rb
+++ b/app/controllers/spree/admin/adjustments_controller.rb
@@ -1,6 +1,6 @@
 module Spree
  module Admin
-    class AdjustmentsController < ResourceController
+    class AdjustmentsController < ::Admin::ResourceController
      belongs_to 'spree/order', find_by: :number
      destroy.after :reload_order

--- a/app/controllers/spree/admin/countries_controller.rb
+++ b/app/controllers/spree/admin/countries_controller.rb
@@ -1,6 +1,6 @@
 module Spree
  module Admin
-    class CountriesController < ResourceController
+    class CountriesController < ::Admin::ResourceController
      protected

      def permitted_resource_params
--- a/app/controllers/spree/admin/images_controller.rb
+++ b/app/controllers/spree/admin/images_controller.rb
@@ -1,6 +1,6 @@
 module Spree
  module Admin
-    class ImagesController < ResourceController
+    class ImagesController < ::Admin::ResourceController
      # This will make resource controller redirect correctly after deleting product images.
      # This can be removed after upgrading to Spree 2.1.
      # See here https://github.com/spree/spree/commit/334a011d2b8e16355e4ae77ae07cd93f7cbc8fd1
--- a/app/controllers/spree/admin/payment_methods_controller.rb
+++ b/app/controllers/spree/admin/payment_methods_controller.rb
@@ -51,7 +51,7 @@ module Spree
      end

      # Only show payment methods that user has access to and sort by distributor name
-      # ! Redundant code copied from Spree::Admin::ResourceController with modifications marked
+      # ! Redundant code copied from Admin::ResourceController with modifications marked
      def collection
        return parent.public_send(controller_name) if parent_data.present?

--- a/app/controllers/spree/admin/product_properties_controller.rb
+++ b/app/controllers/spree/admin/product_properties_controller.rb
@@ -1,6 +1,6 @@
 module Spree
  module Admin
-    class ProductPropertiesController < ResourceController
+    class ProductPropertiesController < ::Admin::ResourceController
      belongs_to 'spree/product', find_by: :permalink
      before_action :find_properties
      before_action :setup_property, only: [:index]
--- a/app/controllers/spree/admin/products_controller.rb
+++ b/app/controllers/spree/admin/products_controller.rb
@@ -4,7 +4,7 @@ require 'open_food_network/permissions'

 module Spree
  module Admin
-    class ProductsController < ResourceController
+    class ProductsController < ::Admin::ResourceController
      helper 'spree/products'
      include OpenFoodNetwork::SpreeApiKeyLoader
      include OrderCyclesHelper
--- a/app/controllers/spree/admin/properties_controller.rb
+++ b/app/controllers/spree/admin/properties_controller.rb
@@ -1,6 +1,6 @@
 module Spree
  module Admin
-    class PropertiesController < ResourceController
+    class PropertiesController < ::Admin::ResourceController
      def permitted_resource_params
        params.require(:property).permit(:name, :presentation)
      end
--- a/app/controllers/spree/admin/return_authorizations_controller.rb
+++ b/app/controllers/spree/admin/return_authorizations_controller.rb
@@ -1,6 +1,6 @@
 module Spree
  module Admin
-    class ReturnAuthorizationsController < ResourceController
+    class ReturnAuthorizationsController < ::Admin::ResourceController
      belongs_to 'spree/order', find_by: :number

      update.after :associate_inventory_units
--- a/app/controllers/spree/admin/shipping_categories_controller.rb
+++ b/app/controllers/spree/admin/shipping_categories_controller.rb
@@ -1,6 +1,6 @@
 module Spree
  module Admin
-    class ShippingCategoriesController < ResourceController
+    class ShippingCategoriesController < ::Admin::ResourceController
      protected

      def permitted_resource_params
--- a/app/controllers/spree/admin/shipping_methods_controller.rb
+++ b/app/controllers/spree/admin/shipping_methods_controller.rb
@@ -1,6 +1,6 @@
 module Spree
  module Admin
-    class ShippingMethodsController < ResourceController
+    class ShippingMethodsController < ::Admin::ResourceController
      before_action :load_data, except: [:index]
      before_action :set_shipping_category, only: [:create, :update]
      before_action :set_zones, only: [:create, :update]
--- a/app/controllers/spree/admin/states_controller.rb
+++ b/app/controllers/spree/admin/states_controller.rb
@@ -1,6 +1,6 @@
 module Spree
  module Admin
-    class StatesController < ResourceController
+    class StatesController < ::Admin::ResourceController
      belongs_to 'spree/country'
      before_action :load_data

--- a/app/controllers/spree/admin/tax_categories_controller.rb
+++ b/app/controllers/spree/admin/tax_categories_controller.rb
@@ -1,6 +1,6 @@
 module Spree
  module Admin
-    class TaxCategoriesController < ResourceController
+    class TaxCategoriesController < ::Admin::ResourceController
      def destroy
        if @object.destroy
          flash[:success] = flash_message_for(@object, :successfully_removed)
--- a/app/controllers/spree/admin/tax_rates_controller.rb
+++ b/app/controllers/spree/admin/tax_rates_controller.rb
@@ -1,6 +1,6 @@
 module Spree
  module Admin
-    class TaxRatesController < ResourceController
+    class TaxRatesController < ::Admin::ResourceController
      before_action :load_data

      private
--- a/app/controllers/spree/admin/taxonomies_controller.rb
+++ b/app/controllers/spree/admin/taxonomies_controller.rb
@@ -1,6 +1,6 @@
 module Spree
  module Admin
-    class TaxonomiesController < ResourceController
+    class TaxonomiesController < ::Admin::ResourceController
      respond_to :json, only: [:get_children]

      def get_children
--- a/app/controllers/spree/admin/users_controller.rb
+++ b/app/controllers/spree/admin/users_controller.rb
@@ -100,7 +100,7 @@ module Spree

      private

-      # handling raise from Spree::Admin::ResourceController#destroy
+      # handling raise from Admin::ResourceController#destroy
      def user_destroy_with_orders_error
        invoke_callbacks(:destroy, :fails)
        render status: :forbidden, text: Spree.t(:error_user_destroy_with_orders)
--- a/app/controllers/spree/admin/variants_controller.rb
+++ b/app/controllers/spree/admin/variants_controller.rb
@@ -2,7 +2,7 @@ require 'open_food_network/scope_variants_for_search'

 module Spree
  module Admin
-    class VariantsController < ResourceController
+    class VariantsController < ::Admin::ResourceController
      helper 'spree/products'

      belongs_to 'spree/product', find_by: :permalink
--- a/app/controllers/spree/admin/zones_controller.rb
+++ b/app/controllers/spree/admin/zones_controller.rb
@@ -1,6 +1,6 @@
 module Spree
  module Admin
-    class ZonesController < ResourceController
+    class ZonesController < ::Admin::ResourceController
      before_action :load_data, except: [:index]

      def new