From 82fb56e4c062ac46e0972ce7fd04e3f48c7a2956 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juanjo=20Baz=C3=A1n?= Date: Mon, 24 Aug 2015 18:59:53 +0200 Subject: [PATCH] refactors comments controller ugly method --- app/controllers/comments_controller.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index 18ffdbc97..798196ca0 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -44,9 +44,9 @@ class CommentsController < ApplicationController end def check_for_special_comments - if ["1", true].include?(comment_params[:as_administrator]) && can?(:comment_as_administrator, debate) + if administrator_comment? @comment.administrator_id = current_user.administrator.id - elsif ["1", true].include?(comment_params[:as_moderator]) && can?(:comment_as_moderator, debate) + elsif moderator_comment? @comment.moderator_id = current_user.moderator.id end end @@ -71,4 +71,12 @@ class CommentsController < ApplicationController reply? && parent.author.email_on_comment_reply? end + def administrator_comment? + ["1", true].include?(comment_params[:as_administrator]) && can?(:comment_as_administrator, Debate) + end + + def moderator_comment? + ["1", true].include?(comment_params[:as_moderator]) && can?(:comment_as_moderator, Debate) + end + end