From d25193287098ab578b34d3b9214fcbeab6e80fbe Mon Sep 17 00:00:00 2001
From: Mauricio Giacomini Girardello <mauriciogiacomini4@gmail.com>
Date: Tue, 27 Oct 2015 11:18:28 -0200
Subject: [PATCH] refactoring learning objects controller
---
.../learning_objects_controller.rb | 30 ++++++++++---------
1 file changed, 16 insertions(+), 14 deletions(-)
diff --git a/app/controllers/learning_objects_controller.rb b/app/controllers/learning_objects_controller.rb
index af0edaa2..2b4dc78f 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
--
GitLab