Merge branch 'master' into moderation

[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 ba35b79789d8229a52b7c331cd9b970e36bd45d1..448b2a5d619e1b97d9d5d20e5c9febe72c878d84 100644 (file)
--- a/app/controllers/issue_comments_controller.rb
+++ b/app/controllers/issue_comments_controller.rb
@@ -9,12 +9,9 @@ class IssueCommentsController < ApplicationController
     @issue = Issue.find(params[:issue_id])
     comment = @issue.comments.build(issue_comment_params)
     comment.user = current_user
     @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")
     comment.save!
     notice = t("issues.comment.comment_created")

+    reassign_issue(@issue) if params[:reassign]

     redirect_to @issue, :notice => notice
   end
 
     redirect_to @issue, :notice => notice
   end
 


@@ -30,4 +27,11 @@ class IssueCommentsController < ApplicationController
       redirect_to root_path
     end
   end
       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
 end