Merge remote-tracking branch 'upstream/pull/3017'

[rails.git] / app / controllers / issue_comments_controller.rb

diff --git a/app/controllers/issue_comments_controller.rb b/app/controllers/issue_comments_controller.rb
index 448b2a5d619e1b97d9d5d20e5c9febe72c878d84..3a6b357f90b5bc39d21fc222f1a45c043214405b 100644 (file)
--- a/app/controllers/issue_comments_controller.rb
+++ b/app/controllers/issue_comments_controller.rb
@@ -2,15 +2,16 @@ class IssueCommentsController < ApplicationController
   layout "site"
 
   before_action :authorize_web
   layout "site"
 
   before_action :authorize_web

-  before_action :require_user
-  before_action :check_permission
+  before_action :set_locale
+
+  authorize_resource

 
   def create
     @issue = Issue.find(params[:issue_id])
     comment = @issue.comments.build(issue_comment_params)
     comment.user = current_user
     comment.save!
 
   def create
     @issue = Issue.find(params[:issue_id])
     comment = @issue.comments.build(issue_comment_params)
     comment.user = current_user
     comment.save!

-    notice = t("issues.comment.comment_created")
+    notice = t(".comment_created")

     reassign_issue(@issue) if params[:reassign]
     redirect_to @issue, :notice => notice
   end
     reassign_issue(@issue) if params[:reassign]
     redirect_to @issue, :notice => notice
   end


@@ -21,13 +22,6 @@ class IssueCommentsController < ApplicationController
     params.require(:issue_comment).permit(:body)
   end
 
     params.require(:issue_comment).permit(:body)
   end
 

-  def check_permission
-    unless current_user.administrator? || current_user.moderator?
-      flash[:error] = t("application.require_admin.not_an_admin")
-      redirect_to root_path
-    end
-  end
-

   # This sort of assumes there are only two roles
   def reassign_issue(issue)
     role = (Issue::ASSIGNED_ROLES - [issue.assigned_role]).first
   # This sort of assumes there are only two roles
   def reassign_issue(issue)
     role = (Issue::ASSIGNED_ROLES - [issue.assigned_role]).first