Skip to content

Business intelligence made simple

Fixed user loading in engine

Andrew458598a586aa
diff --git a/lib/blazer.rb b/lib/blazer.rb
index 5b546636..c57aab70 100644
--- a/lib/blazer.rb
+++ b/lib/blazer.rb
@@ -24,8 +24,8 @@ module Blazer
attr_accessor :audit
attr_reader :time_zone
attr_accessor :user_name
- attr_accessor :user_class
- attr_accessor :user_method
+ attr_writer :user_class
+ attr_writer :user_method
attr_accessor :before_action
attr_accessor :from_email
attr_accessor :cache
@@ -59,6 +59,23 @@ module Blazer
@time_zone = time_zone.is_a?(ActiveSupport::TimeZone) ? time_zone : ActiveSupport::TimeZone[time_zone.to_s]
end
+ def self.user_class
+ if !defined?(@user_class)
+ @user_class = Blazer.settings.key?("user_class") ? Blazer.settings["user_class"] : (User rescue nil)
+ end
+ @user_class
+ end
+
+ def self.user_method
+ if !defined?(@user_method)
+ @user_method ||= Blazer.settings["user_method"]
+ if user_class
+ @user_method ||= "current_#{Blazer.user_class.to_s.downcase.singularize}"
+ end
+ end
+ @user_method
+ end
+
def self.settings
@settings ||= begin
path = Rails.root.join("config", "blazer.yml").to_s
diff --git a/lib/blazer/engine.rb b/lib/blazer/engine.rb
index f6b938a1..61d46505 100644
--- a/lib/blazer/engine.rb
+++ b/lib/blazer/engine.rb
@@ -12,22 +12,7 @@ module Blazer
Blazer.user_name = Blazer.settings["user_name"] if Blazer.settings["user_name"]
Blazer.from_email = Blazer.settings["from_email"] if Blazer.settings["from_email"]
Blazer.before_action = Blazer.settings["before_action"] if Blazer.settings["before_action"]
-
- Blazer.user_class ||= Blazer.settings.key?("user_class") ? Blazer.settings["user_class"] : (User rescue nil)
- Blazer.user_method = Blazer.settings["user_method"]
- if Blazer.user_class
- Blazer.user_method ||= "current_#{Blazer.user_class.to_s.downcase.singularize}"
- end
-
Blazer.check_schedules = Blazer.settings["check_schedules"] if Blazer.settings.key?("check_schedules")
-
- if Blazer.user_class
- options = Blazer::BELONGS_TO_OPTIONAL.merge(class_name: Blazer.user_class.to_s)
- Blazer::Query.belongs_to :creator, options
- Blazer::Dashboard.belongs_to :creator, options
- Blazer::Check.belongs_to :creator, options
- end
-
Blazer.cache ||= Rails.cache
Blazer.anomaly_checks = Blazer.settings["anomaly_checks"] || false