From 2968b926774f8eebb9dc2b4be9e2ebca7f473607 Mon Sep 17 00:00:00 2001 From: takezoe Date: Thu, 24 Oct 2013 04:25:50 +0900 Subject: [PATCH] Add the commit link to refs comment. --- src/main/scala/servlet/GitRepositoryServlet.scala | 2 +- src/main/twirl/issues/commentlist.scala.html | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/scala/servlet/GitRepositoryServlet.scala b/src/main/scala/servlet/GitRepositoryServlet.scala index e16f48c8a..1ae0062d4 100644 --- a/src/main/scala/servlet/GitRepositoryServlet.scala +++ b/src/main/scala/servlet/GitRepositoryServlet.scala @@ -149,7 +149,7 @@ class CommitLogHook(owner: String, repository: String, userName: String, baseURL "(^|\\W)#(\\d+)(\\W|$)".r.findAllIn(commit.fullMessage).matchData.foreach { matchData => val issueId = matchData.group(2) if(getAccountByUserName(commit.committer).isDefined && getIssue(owner, repository, issueId).isDefined){ - createComment(owner, repository, commit.committer, issueId.toInt, commit.fullMessage, "commit") + createComment(owner, repository, commit.committer, issueId.toInt, commit.id + " " + commit.fullMessage, "commit") } } } diff --git a/src/main/twirl/issues/commentlist.scala.html b/src/main/twirl/issues/commentlist.scala.html index 3c19aa4a9..4071dcf67 100644 --- a/src/main/twirl/issues/commentlist.scala.html +++ b/src/main/twirl/issues/commentlist.scala.html @@ -21,7 +21,14 @@
- @markdown(comment.content, repository, false, true) + @if(comment.action == "commit" && comment.content.split(" ").last.matches("[a-f0-9]{40}")){ + @defining(comment.content.substring(comment.content.length - 40)){ id => + + @markdown(comment.content.substring(0, comment.content.length - 41), repository, false, true) + } + } else { + @markdown(comment.content, repository, false, true) + }
}