Remove a couple N+1 queries (#656)

gitcoinco · Oct 9, 2019 · 9e02cfc · 9e02cfc
1 parent 3a81c44
commit 9e02cfc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -54,7 +54,7 @@ def user_statuses_for_select
   end
 
   def advertisers_for_select
-    User.advertisers.sort_by(&:scoped_name).map { |user| [user.scoped_name, user.id] }
+    User.advertisers.includes(:organization).sort_by(&:scoped_name).map { |user| [user.scoped_name, user.id] }
   end
 
   def organizations_for_select

diff --git a/app/models/concerns/campaigns/presentable.rb b/app/models/concerns/campaigns/presentable.rb
@@ -5,7 +5,7 @@ module Presentable
     include ActionView::Helpers::TextHelper
 
     def scoped_name(truncate: false)
-      value = [user.scoped_name, name, creative&.name].compact.join "・"
+      value = [organization&.name, user.name, name, creative&.name].compact.join "・"
       value = truncate(value, length: 60) if truncate
       value
     end