From 1e750f4b9d39d65509aa546a0708e3c8883504ba Mon Sep 17 00:00:00 2001 From: takezoe Date: Fri, 25 Oct 2013 04:28:58 +0900 Subject: [PATCH] (refs #171)Fix link target of pull request number. --- src/main/scala/view/LinkConverter.scala | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/main/scala/view/LinkConverter.scala b/src/main/scala/view/LinkConverter.scala index 968f34fb1..f15bfe677 100644 --- a/src/main/scala/view/LinkConverter.scala +++ b/src/main/scala/view/LinkConverter.scala @@ -15,10 +15,12 @@ trait LinkConverter { self: RequestCache => .replaceAll("&", "&").replaceAll("<", "<").replaceAll(">", ">").replaceAll("\"", """) // convert issue id to link .replaceBy(("(^|\\W)" + issueIdPrefix + "(\\d+)(\\W|$)").r){ m => - if(getIssue(repository.owner, repository.name, m.group(2)).isDefined){ - Some(s"""${m.group(1)}#${m.group(2)}${m.group(3)}""") - } else { - Some(s"""${m.group(1)}#${m.group(2)}${m.group(3)}""") + getIssue(repository.owner, repository.name, m.group(2)) match { + case Some(issue) if(issue.isPullRequest) + => Some(s"""${m.group(1)}#${m.group(2)}${m.group(3)}""") + case Some(_) => Some(s"""${m.group(1)}#${m.group(2)}${m.group(3)}""") + case None => Some(s"""${m.group(1)}#${m.group(2)}${m.group(3)}""") + } } // convert @username to link