Business intelligence made simple
fix devise model name (example - administarator)
Ermolaev Andrey04c19ebf7e51
diff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rbindex 5de20192..0e197177 100644--- a/app/controllers/blazer/queries_controller.rb+++ b/app/controllers/blazer/queries_controller.rb@@ -26,7 +26,7 @@ module Blazerdef create@query = Blazer::Query.new(query_params)- @query.creator = current_user if respond_to?(:current_user) && Blazer.user_class+ @query.creator = blazer_userif @query.saveredirect_to query_path(@query, variable_params)@@ -65,7 +65,7 @@ module Blazerif Blazer.auditaudit = Blazer::Audit.new(statement: @statement)audit.query = @query- audit.user = current_user if respond_to?(:current_user) && Blazer.user_class+ audit.user = blazer_useraudit.save!end@@ -226,5 +226,11 @@ module Blazerdef postgresql?Blazer::Connection.connection.adapter_name == "PostgreSQL"end++ def blazer_user+ send(Blazer.current_user_name) if Blazer.current_user_name+ end+ helper_method :blazer_user+endenddiff --git a/app/views/blazer/queries/index.html.erb b/app/views/blazer/queries/index.html.erbindex 4e0f50ff..3ea55834 100644--- a/app/views/blazer/queries/index.html.erb+++ b/app/views/blazer/queries/index.html.erb@@ -30,7 +30,7 @@<td class="creator text-right text-muted"><% if query.respond_to?(:creator) && (creator = query.creator) && creator.respond_to?(Blazer.user_name) %><% name = creator.send(Blazer.user_name) %>- <% if respond_to?(:current_user) and creator == current_user %>+ <% if creator == blazer_user %>You<div class="hide">me <%= name %></div><% else %>diff --git a/lib/blazer.rb b/lib/blazer.rbindex ccd5786d..dc628787 100644--- a/lib/blazer.rb+++ b/lib/blazer.rb@@ -5,11 +5,8 @@ require "blazer/engine"module Blazerclass << self- attr_accessor :auditattr_reader :time_zone- attr_accessor :user_name- attr_accessor :user_class- attr_accessor :timeout+ attr_accessor :audit, :user_name, :user_class, :timeout, :current_user_nameendself.audit = trueself.user_name = :namediff --git a/lib/blazer/engine.rb b/lib/blazer/engine.rbindex cfbe5f54..cabf36ee 100644--- a/lib/blazer/engine.rb+++ b/lib/blazer/engine.rb@@ -7,7 +7,12 @@ module Blazerapp.config.assets.precompile << proc { |path| path =~ /\Ablazer\/application\.(js|css)\z/ }Blazer.time_zone ||= Time.zone- Blazer.user_class ||= User rescue nil+ Blazer.user_class ||= Devise.mappings.values[0].class_name rescue nil++ if Blazer.user_class+ Blazer.current_user_name = "current_#{Blazer.user_class.downcase.singularize}"+ end+Blazer::Query.belongs_to :creator, class_name: Blazer.user_class.to_s if Blazer.user_classendend