From 5eb9c7cc741e4f1d4044f5fe44a53ac62458a598 Mon Sep 17 00:00:00 2001
From: Giovanne Marcelo <gms15@inf.ufpr.br>
Date: Sat, 12 Mar 2016 11:00:27 -0300
Subject: [PATCH] Fixing welcome and collections include

---
 app/controllers/collections_controller.rb | 2 +-
 app/controllers/welcome_controller.rb     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/collections_controller.rb b/app/controllers/collections_controller.rb
index e94d2d77..5d931849 100644
--- a/app/controllers/collections_controller.rb
+++ b/app/controllers/collections_controller.rb
@@ -123,7 +123,7 @@ class CollectionsController < ApplicationController
         CollectionsGroup.new(title: 'Coleções Automáticas',
                              collections: [current_user.bookmarks]),
         CollectionsGroup.new(title: 'Coleções Adicionadas',
-                             collections: current_user.collections)
+                             collections: current_user.collections.includes(:owner))
     ]
   end
 
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index b6525ea8..76cec1c4 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -3,7 +3,7 @@ class WelcomeController < ApplicationController
 
   def index
     @carousel = Carousel.all || []
-    @highlights = policy_scope(LearningObject).limit(8)
+    @highlights = policy_scope(LearningObject).limit(8).includes(:publisher, :language)
   end
 
   def faq
-- 
GitLab