Merge branch 'master' of https://github.com/takezoe/gitbucket

src/main/scala/app/IssuesController.scala

@@ -50,7 +50,10 @@ trait IssuesControllerBase extends ControllerBase {
     val issueId = params("id")
 
     getIssue(owner, repository, issueId) map {
-      issues.html.issue(_, getRepository(owner, repository, baseUrl).get)
+      issues.html.issue(
+          _,
+          getComment(owner, repository, issueId.toInt),
+          getRepository(owner, repository, baseUrl).get)
     } getOrElse NotFound
   }
 

src/main/scala/service/IssuesService.scala

@@ -18,6 +18,13 @@ trait IssuesService {
       } firstOption
     else None
 
+  def getComment(owner: String, repository: String, issueId: Int) =
+    Query(IssueComments) filter { t =>
+      (t.userName is owner.bind) &&
+      (t.repositoryName is repository.bind) &&
+      (t.issueId is issueId.bind)
+    } list
+
   def searchIssue(owner: String, repository: String,
       // TODO It is better to have a DTO
       closed: Boolean) =