(refs #567)Fix condition of repository search for issues.

This commit is contained in:
Naoki Takezoe
2014-12-05 02:10:28 +09:00
parent bc75f9f8a2
commit 9767903252
3 changed files with 5 additions and 1 deletions

View File

@@ -263,6 +263,7 @@ trait IssuesService {
// Search Issue // Search Issue
val issues = Issues val issues = Issues
.filter(_.byRepository(owner, repository))
.innerJoin(IssueOutline).on { case (t1, t2) => .innerJoin(IssueOutline).on { case (t1, t2) =>
t1.byIssue(t2.userName, t2.repositoryName, t2.issueId) t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
} }
@@ -278,6 +279,7 @@ trait IssuesService {
// Search IssueComment // Search IssueComment
val comments = IssueComments val comments = IssueComments
.filter(_.byRepository(owner, repository))
.innerJoin(Issues).on { case (t1, t2) => .innerJoin(Issues).on { case (t1, t2) =>
t1.byIssue(t2.userName, t2.repositoryName, t2.issueId) t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
} }

View File

@@ -20,6 +20,7 @@ trait RepositorySearchService { self: IssuesService =>
searchIssuesByKeyword(owner, repository, query).map { case (issue, commentCount, content) => searchIssuesByKeyword(owner, repository, query).map { case (issue, commentCount, content) =>
IssueSearchResult( IssueSearchResult(
issue.issueId, issue.issueId,
issue.isPullRequest,
issue.title, issue.title,
issue.openedUserName, issue.openedUserName,
issue.registeredDate, issue.registeredDate,
@@ -111,6 +112,7 @@ object RepositorySearchService {
case class IssueSearchResult( case class IssueSearchResult(
issueId: Int, issueId: Int,
isPullRequest: Boolean,
title: String, title: String,
openedUserName: String, openedUserName: String,
registeredDate: java.util.Date, registeredDate: java.util.Date,

View File

@@ -16,7 +16,7 @@
@issues.drop((page - 1) * IssueLimit).take(IssueLimit).map { issue => @issues.drop((page - 1) * IssueLimit).take(IssueLimit).map { issue =>
<div class="block"> <div class="block">
<div class="pull-right muted">#@issue.issueId</div> <div class="pull-right muted">#@issue.issueId</div>
<h4 style="margin-top: 0px;"><a href="@url(repository)/issues/@issue.issueId">@issue.title</a></h4> <h4 style="margin-top: 0px;"><a href="@url(repository)/@if(issue.isPullRequest){pull} else {issues}/@issue.issueId">@issue.title</a></h4>
@if(issue.highlightText.nonEmpty){ @if(issue.highlightText.nonEmpty){
<pre>@Html(issue.highlightText)</pre> <pre>@Html(issue.highlightText)</pre>
} }