From fe98d35d4eba87327210029f97536c0f7b3798ff Mon Sep 17 00:00:00 2001 From: takezoe Date: Mon, 5 Aug 2013 21:06:42 +0900 Subject: [PATCH] (refs #2)Fix redirect path for pull request. --- src/main/scala/app/IssuesController.scala | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/main/scala/app/IssuesController.scala b/src/main/scala/app/IssuesController.scala index bccd939bc..ccebc5e6a 100644 --- a/src/main/scala/app/IssuesController.scala +++ b/src/main/scala/app/IssuesController.scala @@ -128,14 +128,22 @@ trait IssuesControllerBase extends ControllerBase { }) post("/:owner/:repository/issue_comments/new", commentForm)(readableUsersOnly { (form, repository) => - handleComment(form.issueId, Some(form.content), repository)() map { id => - redirect(s"/${repository.owner}/${repository.name}/issues/${form.issueId}#comment-${id}") + handleComment(form.issueId, Some(form.content), repository)() map { case (issue, id) => + if(issue.isPullRequest){ + redirect(s"/${repository.owner}/${repository.name}/pull/${form.issueId}#comment-${id}") + } else { + redirect(s"/${repository.owner}/${repository.name}/issues/${form.issueId}#comment-${id}") + } } getOrElse NotFound }) post("/:owner/:repository/issue_comments/state", issueStateForm)(readableUsersOnly { (form, repository) => - handleComment(form.issueId, form.content, repository)() map { id => - redirect(s"/${repository.owner}/${repository.name}/issues/${form.issueId}#comment-${id}") + handleComment(form.issueId, form.content, repository)() map { case (issue, id) => + if(issue.isPullRequest){ + redirect(s"/${repository.owner}/${repository.name}/pull/${form.issueId}#comment-${id}") + } else { + redirect(s"/${repository.owner}/${repository.name}/issues/${form.issueId}#comment-${id}") + } } getOrElse NotFound }) @@ -294,7 +302,7 @@ trait IssuesControllerBase extends ControllerBase { content foreach ( recordCommentIssueActivity(owner, name, userName, issueId, _) ) recordActivity foreach ( _ (owner, name, userName, issueId, issue.title) ) - commentId + (issue, commentId) } }