Move ?: operator outside of t() for "Only ... can edit" block messages

[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 a4bb6a5ed15af00df5bd0b60132cdfc67461681e..5bf4d023784a587613645f03891f5e2f22ae2cae 100644 (file)
--- a/app/controllers/issue_comments_controller.rb
+++ b/app/controllers/issue_comments_controller.rb
@@ -3,9 +3,12 @@ class IssueCommentsController < ApplicationController
 
   before_action :authorize_web
   before_action :set_locale
 
   before_action :authorize_web
   before_action :set_locale

+  before_action :check_database_readable

 
   authorize_resource
 
 
   authorize_resource
 

+  before_action :check_database_writable, :only => [:create]
+

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


@@ -16,10 +19,10 @@ class IssueCommentsController < ApplicationController
       reassign_issue(@issue)
       flash[:notice] = t ".issue_reassigned"
 
       reassign_issue(@issue)
       flash[:notice] = t ".issue_reassigned"
 

-      if current_user.has_role? @issue.assigned_role
+      if current_user.role? @issue.assigned_role

         redirect_to @issue
       else
         redirect_to @issue
       else

-        redirect_to issues_path
+        redirect_to issues_path(:status => "open")

       end
     else
       flash[:notice] = t(".comment_created")
       end
     else
       flash[:notice] = t(".comment_created")