diff --git a/app/controllers/learning_objects_controller.rb b/app/controllers/learning_objects_controller.rb index fed22c7eb86c947f75de2e65e264363561599916..272fe9eb78917f0de3a1db72fd30fcbd7ed6c268 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 3b374228aab799a0fd298d23d90e8f780c152742..0ebc1032e2b3e8ddef500ab88cbd26c5da225ce4 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 d46c184a6df0d945d822a919ccc1b53a4cb8521e..919034572de13655ca44d212ec13a272d3aa309c 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,