(refs #947)Fix referenced link from pull request

src/main/scala/gitbucket/core/view/LinkConverter.scala

@@ -7,13 +7,31 @@ import gitbucket.core.util.Implicits.RichString
 trait LinkConverter { self: RequestCache =>
 
   /**
-   * Converts issue id, username and commit id to link.
+   * Creates a link to the issue or the pull request from the issue id.
    */
-  protected def convertRefsLinks(value: String, repository: RepositoryService.RepositoryInfo,
+  protected def createIssueLink(repository: RepositoryService.RepositoryInfo, issueId: Int)(implicit context: Context): String = {
+    val userName       = repository.repository.userName
+    val repositoryName = repository.repository.repositoryName
+
+    getIssue(userName, repositoryName, issueId.toString) match {
+      case Some(issue) if (issue.isPullRequest) =>
+        s"""<a href="${context.path}/${userName}/${repositoryName}/pull/${issueId}">Pull #${issueId}</a>"""
+      case Some(_) =>
+        s"""<a href="${context.path}/${userName}/${repositoryName}/issues/${issueId}">Issue #${issueId}</a>"""
+      case None =>
+        s"Unknown #${issueId}"
+    }
+  }
+
+
+  /**
+   * Converts issue id, username and commit id to link in the given text.
+   */
+  protected def convertRefsLinks(text: String, repository: RepositoryService.RepositoryInfo,
                                  issueIdPrefix: String =  "#", escapeHtml: Boolean = true)(implicit context: Context): String = {
 
     // escape HTML tags
-    val escaped = if(escapeHtml) value.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;").replace("\"", "&quot;") else value
+    val escaped = if(escapeHtml) text.replace("&", "&amp;").replace("<", "&lt;").replace(">", "&gt;").replace("\"", "&quot;") else text
 
     escaped
       // convert username/project@SHA to link
@@ -26,10 +44,12 @@ trait LinkConverter { self: RequestCache =>
       // convert username/project#Num to link
       .replaceBy( ("(?<=(^|\\W))([a-zA-Z0-9\\-_]+)/([a-zA-Z0-9\\-_\\.]+)" + issueIdPrefix + "([0-9]+)(?=(\\W|$))").r){ m =>
         getIssue(m.group(2), m.group(3), m.group(4)) match {
-          case Some(issue) if (issue.isPullRequest)
-          => Some( s"""<a href="${context.path}/${m.group(2)}/${m.group(3)}/pull/${m.group(4)}">${m.group(2)}/${m.group(3)}#${m.group(4)}</a>""")
-          case Some(_) => Some( s"""<a href="${context.path}/${m.group(2)}/${m.group(3)}/issues/${m.group(4)}">${m.group(2)}/${m.group(3)}#${m.group(4)}</a>""")
-          case None => Some( s"""${m.group(2)}/${m.group(3)}#${m.group(4)}""")
+          case Some(issue) if (issue.isPullRequest) =>
+            Some(s"""<a href="${context.path}/${m.group(2)}/${m.group(3)}/pull/${m.group(4)}">${m.group(2)}/${m.group(3)}#${m.group(4)}</a>""")
+          case Some(_) =>
+            Some(s"""<a href="${context.path}/${m.group(2)}/${m.group(3)}/issues/${m.group(4)}">${m.group(2)}/${m.group(3)}#${m.group(4)}</a>""")
+          case None =>
+            Some(s"""${m.group(2)}/${m.group(3)}#${m.group(4)}""")
         }
       }
 
@@ -43,10 +63,12 @@ trait LinkConverter { self: RequestCache =>
       // convert username#Num to link
       .replaceBy( ("(?<=(^|\\W))([a-zA-Z0-9\\-_]+)" + issueIdPrefix + "([0-9]+)(?=(\\W|$))").r ) { m =>
         getIssue(m.group(2), repository.name, m.group(3)) match {
-          case Some(issue) if(issue.isPullRequest)
-          => Some(s"""<a href="${context.path}/${m.group(2)}/${repository.name}/pull/${m.group(3)}">${m.group(2)}#${m.group(3)}</a>""")
-          case Some(_) => Some(s"""<a href="${context.path}/${m.group(2)}/${repository.name}/issues/${m.group(3)}">${m.group(2)}#${m.group(3)}</a>""")
-          case None    => Some(s"""${m.group(2)}#${m.group(3)}""")
+          case Some(issue) if(issue.isPullRequest) =>
+            Some(s"""<a href="${context.path}/${m.group(2)}/${repository.name}/pull/${m.group(3)}">${m.group(2)}#${m.group(3)}</a>""")
+          case Some(_) =>
+            Some(s"""<a href="${context.path}/${m.group(2)}/${repository.name}/issues/${m.group(3)}">${m.group(2)}#${m.group(3)}</a>""")
+          case None =>
+            Some(s"""${m.group(2)}#${m.group(3)}""")
         }
       }
 
@@ -54,10 +76,12 @@ trait LinkConverter { self: RequestCache =>
       .replaceBy(("(?<=(^|\\W))(GH-|" + issueIdPrefix + ")([0-9]+)(?=(\\W|$))").r){ m =>
         val prefix = if(m.group(2) == "issue:") "#" else m.group(2)
         getIssue(repository.owner, repository.name, m.group(3)) match {
-          case Some(issue) if(issue.isPullRequest)
-          => Some(s"""<a href="${context.path}/${repository.owner}/${repository.name}/pull/${m.group(3)}">${prefix}${m.group(3)}</a>""")
-          case Some(_) => Some(s"""<a href="${context.path}/${repository.owner}/${repository.name}/issues/${m.group(3)}">${prefix}${m.group(3)}</a>""")
-          case None    => Some(s"""${m.group(2)}${m.group(3)}""")
+          case Some(issue) if(issue.isPullRequest) =>
+            Some(s"""<a href="${context.path}/${repository.owner}/${repository.name}/pull/${m.group(3)}">${prefix}${m.group(3)}</a>""")
+          case Some(_) =>
+            Some(s"""<a href="${context.path}/${repository.owner}/${repository.name}/issues/${m.group(3)}">${prefix}${m.group(3)}</a>""")
+          case None =>
+            Some(s"""${m.group(2)}${m.group(3)}""")
         }
       }
 

src/main/scala/gitbucket/core/view/helpers.scala

@@ -93,6 +93,10 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
                pages: List[String] = Nil)(implicit context: Context): Html =
     Html(Markdown.toHtml(value, repository, enableWikiLink, enableRefsLink, true, enableTaskList, hasWritePermission, pages))
 
+  /**
+   * Render the given source (only markdown is supported in default) as HTML.
+   * You can test if a file is renderable in this method by [[isRenderable()]].
+   */
   def renderMarkup(filePath: List[String], fileContent: String, branch: String,
                    repository: RepositoryService.RepositoryInfo,
                    enableWikiLink: Boolean, enableRefsLink: Boolean, enableAnchor: Boolean)(implicit context: Context): Html = {
@@ -103,10 +107,20 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
     renderer.render(RenderRequest(filePath, fileContent, branch, repository, enableWikiLink, enableRefsLink, enableAnchor, context))
   }
 
+  /**
+   * Tests whether the given file is renderable. It's tested by the file extension.
+   */
   def isRenderable(fileName: String): Boolean = {
     PluginRegistry().renderableExtensions.exists(extension => fileName.toLowerCase.endsWith("." + extension))
   }
 
+  /**
+   * Creates a link to the issue or the pull request from the issue id.
+   */
+  def issueLink(repository: RepositoryService.RepositoryInfo, issueId: Int)(implicit context: Context): Html = {
+    Html(createIssueLink(repository, issueId))
+  }
+
   /**
    * Returns <img> which displays the avatar icon for the given user name.
    * This method looks up Gravatar if avatar icon has not been configured in user settings.

src/main/twirl/gitbucket/core/issues/commentlist.scala.html

@@ -55,7 +55,7 @@
           } else {
             @if(comment.action == "refer"){
               @defining(comment.content.split(":")){ case Array(issueId, rest @ _*) =>
-                <strong><a href="@path/@repository.owner/@repository.name/issues/@issueId">Issue #@issueId</a>: @rest.mkString(":")</strong>
+                <strong>@issueLink(repository, issueId.toInt): @rest.mkString(":")</strong>
               }
             } else {
                 <div class="markdown-body">@markdown(comment.content, repository, false, true, true, hasWritePermission)</div>