From b78bbd2629202c87b8095049c1de937a3c686a0c Mon Sep 17 00:00:00 2001 From: Neal Chambers Date: Thu, 17 Aug 2023 16:40:01 +0900 Subject: [PATCH] Fix Rails/ApplicationController --- .../{base_controller.rb => application_controller.rb} | 2 +- .../app/controllers/dfc_provider/catalog_items_controller.rb | 2 +- .../app/controllers/dfc_provider/enterprises_controller.rb | 2 +- .../app/controllers/dfc_provider/persons_controller.rb | 2 +- .../controllers/dfc_provider/supplied_products_controller.rb | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename engines/dfc_provider/app/controllers/dfc_provider/{base_controller.rb => application_controller.rb} (94%) diff --git a/engines/dfc_provider/app/controllers/dfc_provider/base_controller.rb b/engines/dfc_provider/app/controllers/dfc_provider/application_controller.rb similarity index 94% rename from engines/dfc_provider/app/controllers/dfc_provider/base_controller.rb rename to engines/dfc_provider/app/controllers/dfc_provider/application_controller.rb index 389882a078..bbd12157d8 100644 --- a/engines/dfc_provider/app/controllers/dfc_provider/base_controller.rb +++ b/engines/dfc_provider/app/controllers/dfc_provider/application_controller.rb @@ -2,7 +2,7 @@ # Controller used to provide the API products for the DFC application module DfcProvider - class BaseController < ActionController::Base + class ApplicationController < ActionController::Base protect_from_forgery with: :null_session rescue_from ActiveRecord::RecordNotFound, with: :not_found diff --git a/engines/dfc_provider/app/controllers/dfc_provider/catalog_items_controller.rb b/engines/dfc_provider/app/controllers/dfc_provider/catalog_items_controller.rb index 9dfa9e51a4..d0bc006b52 100644 --- a/engines/dfc_provider/app/controllers/dfc_provider/catalog_items_controller.rb +++ b/engines/dfc_provider/app/controllers/dfc_provider/catalog_items_controller.rb @@ -3,7 +3,7 @@ # Controller used to provide the API products for the DFC application # CatalogItems are items that are being sold by the entreprise. module DfcProvider - class CatalogItemsController < DfcProvider::BaseController + class CatalogItemsController < DfcProvider::ApplicationController before_action :check_enterprise def index diff --git a/engines/dfc_provider/app/controllers/dfc_provider/enterprises_controller.rb b/engines/dfc_provider/app/controllers/dfc_provider/enterprises_controller.rb index df04f708a3..a80aa6602a 100644 --- a/engines/dfc_provider/app/controllers/dfc_provider/enterprises_controller.rb +++ b/engines/dfc_provider/app/controllers/dfc_provider/enterprises_controller.rb @@ -2,7 +2,7 @@ # Controller used to provide the CatalogItem API for the DFC application module DfcProvider - class EnterprisesController < DfcProvider::BaseController + class EnterprisesController < DfcProvider::ApplicationController before_action :check_enterprise def show diff --git a/engines/dfc_provider/app/controllers/dfc_provider/persons_controller.rb b/engines/dfc_provider/app/controllers/dfc_provider/persons_controller.rb index 20f7623a5a..f52ddca480 100644 --- a/engines/dfc_provider/app/controllers/dfc_provider/persons_controller.rb +++ b/engines/dfc_provider/app/controllers/dfc_provider/persons_controller.rb @@ -2,7 +2,7 @@ # Controller used to provide the Persons API for the DFC application module DfcProvider - class PersonsController < DfcProvider::BaseController + class PersonsController < DfcProvider::ApplicationController before_action :check_user_accessibility def show diff --git a/engines/dfc_provider/app/controllers/dfc_provider/supplied_products_controller.rb b/engines/dfc_provider/app/controllers/dfc_provider/supplied_products_controller.rb index d6842225f0..e2da4c46b7 100644 --- a/engines/dfc_provider/app/controllers/dfc_provider/supplied_products_controller.rb +++ b/engines/dfc_provider/app/controllers/dfc_provider/supplied_products_controller.rb @@ -3,7 +3,7 @@ # Controller used to provide the SuppliedProducts API for the DFC application # SuppliedProducts are products that are managed by an enterprise. module DfcProvider - class SuppliedProductsController < DfcProvider::BaseController + class SuppliedProductsController < DfcProvider::ApplicationController before_action :check_enterprise rescue_from JSON::LD::JsonLdError::LoadingDocumentFailed, with: -> do head :bad_request