diff --git a/app/controllers/learning_objects_controller.rb b/app/controllers/learning_objects_controller.rb index af0edaa22a858eb0d18e65100145a74a8f982b46..2b4dc78fb8d094ee26b1f03e9db5c487d5d59efc 100644 --- a/app/controllers/learning_objects_controller.rb +++ b/app/controllers/learning_objects_controller.rb @@ -1,9 +1,8 @@ class LearningObjectsController < ApplicationController - include Reportable - before_action :set_learning_object, only: [:show, :edit, :update, :destroy, :like, :bookmark] after_action :increment_learning_object_views, only: [:show] before_action :authenticate_user!, except: [:index, :show, :like] + before_action :set_complaint_messages, only: :show # GET /learning_objects # GET /learning_objects.json @@ -14,13 +13,6 @@ class LearningObjectsController < ApplicationController # GET /learning_objects/1 # GET /learning_objects/1.json def show - @complaint = Complaint.new - @messages = [ - Complaint.copyrights, - Complaint.ofensive_content, - Complaint.ofensive_user, - Complaint.fake_user - ] end # GET /learning_objects/new @@ -68,6 +60,10 @@ class LearningObjectsController < ApplicationController end end + def report_object + learning_object_repository.report current_user, @learning_object, message, description + end + # POST /learning_objects/1/like def like if @learning_object.liked? current_user @@ -81,11 +77,7 @@ class LearningObjectsController < ApplicationController end end - - def report_object - learning_object_repository.report current_user, @learning_object, message, description - end - + # POST /learning_objects/1/bookmarks def bookmarks bookmarks = current_user.bookmarks bookmarks.add @learning_object @@ -114,4 +106,14 @@ class LearningObjectsController < ApplicationController end end + def set_complaint_messages + @complaint = Complaint.new + @messages = [ + Complaint.copyrights, + Complaint.ofensive_content, + Complaint.ofensive_user, + Complaint.fake_user + ] + end + end