]> git.openstreetmap.org Git - rails.git/blobdiff - app/controllers/issue_comments_controller.rb
Merge branch 'master' into messages
[rails.git] / app / controllers / issue_comments_controller.rb
index ba35b79789d8229a52b7c331cd9b970e36bd45d1..8d1acec759699d511058061152f5fcd966dad15c 100644 (file)
@@ -2,6 +2,7 @@ class IssueCommentsController < ApplicationController
   layout "site"
 
   before_action :authorize_web
+  before_action :set_locale
   before_action :require_user
   before_action :check_permission
 
@@ -9,12 +10,9 @@ class IssueCommentsController < ApplicationController
     @issue = Issue.find(params[:issue_id])
     comment = @issue.comments.build(issue_comment_params)
     comment.user = current_user
-    # if params[:reassign]
-    #   reassign_issue
-    #   @issue_comment.reassign = true
-    # end
     comment.save!
-    notice = t("issues.comment.comment_created")
+    notice = t(".comment_created")
+    reassign_issue(@issue) if params[:reassign]
     redirect_to @issue, :notice => notice
   end
 
@@ -26,8 +24,15 @@ class IssueCommentsController < ApplicationController
 
   def check_permission
     unless current_user.administrator? || current_user.moderator?
-      flash[:error] = t("application.require_admin.not_an_admin")
+      flash[:error] = t("application.require_moderator_or_admin.not_a_moderator_or_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
+    issue.assigned_role = role
+    issue.save!
+  end
 end