diff --git a/src/main/scala/app/IssuesController.scala b/src/main/scala/app/IssuesController.scala index cfb9404..188021a 100644 --- a/src/main/scala/app/IssuesController.scala +++ b/src/main/scala/app/IssuesController.scala @@ -60,6 +60,7 @@ issues.html.issue( _, getComments(owner, repository, issueId.toInt), + getIssueLabel(owner, repository, issueId.toInt), getRepository(owner, repository, baseUrl).get) } getOrElse NotFound } diff --git a/src/main/scala/service/IssuesService.scala b/src/main/scala/service/IssuesService.scala index f205df4..dd95b0c 100644 --- a/src/main/scala/service/IssuesService.scala +++ b/src/main/scala/service/IssuesService.scala @@ -25,6 +25,15 @@ Query(IssueComments) filter (_.byPrimaryKey(commentId.toInt)) firstOption else None + def getIssueLabel(owner: String, repository: String, issueId: Int) = + IssueLabels + .innerJoin(Labels).on { (t1, t2) => + t1.byLabel(t2.userName, t2.repositoryName, t2.labelId) + } + .filter ( _._1.byIssue(owner, repository, issueId) ) + .map ( _._2 ) + .list + /** * Returns the count of the search result against issues. * @@ -171,7 +180,7 @@ } get def registerIssueLabel(owner: String, repository: String, issueId: Int, labelId: Int): Unit = - IssueLabels.* insert (IssueLabel(owner, repository, issueId, labelId)) + IssueLabels insert (IssueLabel(owner, repository, issueId, labelId)) def createComment(owner: String, repository: String, loginUser: String, issueId: Int, content: String, action: Option[String]) = diff --git a/src/main/twirl/issues/issue.scala.html b/src/main/twirl/issues/issue.scala.html index c67b30d..749a703 100644 --- a/src/main/twirl/issues/issue.scala.html +++ b/src/main/twirl/issues/issue.scala.html @@ -1,4 +1,4 @@ -@(issue: model.Issue, comments: List[model.IssueComment], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) +@(issue: model.Issue, comments: List[model.IssueComment], issueLabels: List[model.Label], repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) @import context._ @import view.helpers._ @html.main("%s - Issue #%d - %s/%s".format(issue.title, issue.issueId, repository.owner, repository.name)){ @@ -77,8 +77,9 @@