From 197cdeeb2afbc93eb25cb5cb6fd8ad539d6f15dd Mon Sep 17 00:00:00 2001
From: Mauricio Giacomini Girardello <mgg12@inf.ufpr.br>
Date: Wed, 24 Feb 2016 10:34:46 -0300
Subject: [PATCH] setting default scope for learning objects now, learning
 objects includes objects types and will be ordered by score

---
 app/controllers/learning_objects_controller.rb | 4 ++--
 app/controllers/welcome_controller.rb          | 2 +-
 app/models/learning_object.rb                  | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/controllers/learning_objects_controller.rb b/app/controllers/learning_objects_controller.rb
index fed22c7e..272fe9eb 100644
--- a/app/controllers/learning_objects_controller.rb
+++ b/app/controllers/learning_objects_controller.rb
@@ -21,7 +21,7 @@ class LearningObjectsController < ApplicationController
     @learning_object = LearningObject.new
     @school_levels = ['EducaçÃĢo Infantil', 'Ensino Fundamental', 'Ensino MÃĐdio']
     @topics = Topic.defaults
-    @types = LearningObject.object_types
+    @types = ObjectType.all
     @languages = Language.all
   end
 
@@ -74,7 +74,7 @@ class LearningObjectsController < ApplicationController
   def like
     if @learning_object.liked? current_user
       @learning_object.dislike current_user
-    else
+    elseg
       @learning_object.like current_user
     end
 
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 3b374228..0ebc1032 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 = LearningObject.order(:score).limit(6)
+    @highlights = LearningObject.limit(6)
   end
 
   def faq
diff --git a/app/models/learning_object.rb b/app/models/learning_object.rb
index d46c184a..91903457 100644
--- a/app/models/learning_object.rb
+++ b/app/models/learning_object.rb
@@ -20,6 +20,8 @@ class LearningObject < ActiveRecord::Base
 
   searchkick language: 'brazilian', match: :word_start, searchable: [:name, :description, :author, :object_type]
 
+  default_scope { includes(:object_type).order(:score) }
+
   def search_data
     {
         name: name,
-- 
GitLab