Business intelligence made simple
Allow Blazer to work without a user model - closes #14
Andrew Kaneae75629997fd
diff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rbindex 781f29ee..8d4a228b 100644--- a/app/controllers/blazer/queries_controller.rb+++ b/app/controllers/blazer/queries_controller.rb@@ -15,7 +15,8 @@ module Blazerbefore_action :set_query, only: [:show, :edit, :update, :destroy]def index- @queries = Blazer::Query.order(:name).includes(:creator)+ @queries = Blazer::Query.order(:name)+ @queries = @queries.includes(:creator) if Blazer.user_class@trending_queries = Blazer::Audit.group(:query_id).where("created_at > ?", 2.days.ago).having("COUNT(DISTINCT user_id) >= 3").uniq.count(:user_id)end@@ -25,7 +26,7 @@ module Blazerdef create@query = Blazer::Query.new(query_params)- @query.creator = current_user if respond_to?(:current_user)+ @query.creator = current_user if respond_to?(:current_user) && Blazer.user_classif @query.saveredirect_to @query@@ -64,7 +65,7 @@ module Blazerif Blazer.auditaudit = Blazer::Audit.new(statement: @statement)audit.query = @query- audit.user = current_user if respond_to?(:current_user)+ audit.user = current_user if respond_to?(:current_user) && Blazer.user_classaudit.save!enddiff --git a/app/models/blazer/query.rb b/app/models/blazer/query.rbindex a72ba485..ccff03b2 100644--- a/app/models/blazer/query.rb+++ b/app/models/blazer/query.rb@@ -1,6 +1,6 @@module Blazerclass Query < ActiveRecord::Base- belongs_to :creator, class_name: Blazer.user_class.to_s+ belongs_to :creator, class_name: Blazer.user_class.to_s if Blazer.user_classvalidates :name, presence: truevalidates :statement, presence: truediff --git a/app/views/blazer/queries/index.html.erb b/app/views/blazer/queries/index.html.erbindex 26ebfae6..954d9f9d 100644--- a/app/views/blazer/queries/index.html.erb+++ b/app/views/blazer/queries/index.html.erb@@ -26,7 +26,7 @@<% end %></td><td class="creator text-right text-muted">- <% if (creator = query.creator) and creator.respond_to?(Blazer.user_name) %>+ <% 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 %>You