Skip to content

Business intelligence made simple

Fixed n+1 for dashboards

Andrew Kaned7249e1ff6fb
diff --git a/app/controllers/blazer/queries_controller.rb b/app/controllers/blazer/queries_controller.rb
index 1afab4bc..ed4d24b4 100644
--- a/app/controllers/blazer/queries_controller.rb
+++ b/app/controllers/blazer/queries_controller.rb
@@ -4,8 +4,11 @@ module Blazer
def home
set_queries(1000)
+
+ @dashboards = Blazer::Dashboard.order(:name)
+ @dashboards = @dashboards.includes(:creator) if Blazer.user_class
@dashboards =
- Blazer::Dashboard.order(:name).map do |d|
+ @dashboards.map do |d|
{
name: "<strong>#{view_context.link_to(d.name, d)}</strong>",
creator: blazer_user && d.try(:creator) == blazer_user ? "You" : d.try(:creator).try(Blazer.user_name),
diff --git a/app/models/blazer/check.rb b/app/models/blazer/check.rb
index 21fdf1c4..4cde5609 100644
--- a/app/models/blazer/check.rb
+++ b/app/models/blazer/check.rb
@@ -1,5 +1,6 @@
module Blazer
class Check < ActiveRecord::Base
+ belongs_to :creator, Blazer::BELONGS_TO_OPTIONAL.merge(class_name: Blazer.user_class.to_s) if Blazer.user_class
belongs_to :query
validates :query_id, presence: true
diff --git a/app/models/blazer/dashboard.rb b/app/models/blazer/dashboard.rb
index a7202b77..35df3013 100644
--- a/app/models/blazer/dashboard.rb
+++ b/app/models/blazer/dashboard.rb
@@ -1,5 +1,6 @@
module Blazer
class Dashboard < ActiveRecord::Base
+ belongs_to :creator, Blazer::BELONGS_TO_OPTIONAL.merge(class_name: Blazer.user_class.to_s) if Blazer.user_class
has_many :dashboard_queries, dependent: :destroy
has_many :queries, through: :dashboard_queries