diff --git a/app/controllers/blazer/base_controller.rb b/app/controllers/blazer/base_controller.rb index ef4c62551..2ea4112db 100644 --- a/app/controllers/blazer/base_controller.rb +++ b/app/controllers/blazer/base_controller.rb @@ -1,5 +1,5 @@ module Blazer - class BaseController < ApplicationController + class BaseController < Blazer.base_controller.constantize # skip filters filters = _process_action_callbacks.map(&:filter) - [:activate_authlogic] skip_before_action(*filters, raise: false) diff --git a/lib/blazer.rb b/lib/blazer.rb index d98ac94fa..ac32c27ab 100644 --- a/lib/blazer.rb +++ b/lib/blazer.rb @@ -71,6 +71,7 @@ class << self attr_accessor :slack_oauth_token attr_accessor :slack_webhook_url attr_accessor :mapbox_access_token + attr_accessor :base_controller end self.audit = true self.user_name = :name @@ -80,6 +81,7 @@ class << self self.async = false self.images = false self.override_csp = false + self.base_controller = "ApplicationController" VARIABLE_MESSAGE = "Variable cannot be used in this position" TIMEOUT_MESSAGE = "Query timed out :(" diff --git a/lib/blazer/engine.rb b/lib/blazer/engine.rb index ed681ecd4..12fc0eace 100644 --- a/lib/blazer/engine.rb +++ b/lib/blazer/engine.rb @@ -39,6 +39,7 @@ class Engine < ::Rails::Engine Blazer.slack_oauth_token = Blazer.settings["slack_oauth_token"] || ENV["BLAZER_SLACK_OAUTH_TOKEN"] Blazer.slack_webhook_url = Blazer.settings["slack_webhook_url"] || ENV["BLAZER_SLACK_WEBHOOK_URL"] Blazer.mapbox_access_token = Blazer.settings["mapbox_access_token"] || ENV["MAPBOX_ACCESS_TOKEN"] + Blazer.base_controller = Blazer.settings["base_controller"] || "ApplicationController" end end end diff --git a/lib/generators/blazer/templates/config.yml.tt b/lib/generators/blazer/templates/config.yml.tt index 66abf6cc1..9ac68c44b 100644 --- a/lib/generators/blazer/templates/config.yml.tt +++ b/lib/generators/blazer/templates/config.yml.tt @@ -56,6 +56,9 @@ audit: true # webhook for Slack # slack_webhook_url: <%%= ENV["BLAZER_SLACK_WEBHOOK_URL"] %> +# base controller for Blazer::BaseController +# base_controller: ApplicationController + check_schedules: - "1 day" - "1 hour"