mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-08 14:35:52 +01:00
(refs #567)Fix condition of repository search for issues.
This commit is contained in:
@@ -263,6 +263,7 @@ trait IssuesService {
|
||||
|
||||
// Search Issue
|
||||
val issues = Issues
|
||||
.filter(_.byRepository(owner, repository))
|
||||
.innerJoin(IssueOutline).on { case (t1, t2) =>
|
||||
t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
|
||||
}
|
||||
@@ -278,6 +279,7 @@ trait IssuesService {
|
||||
|
||||
// Search IssueComment
|
||||
val comments = IssueComments
|
||||
.filter(_.byRepository(owner, repository))
|
||||
.innerJoin(Issues).on { case (t1, t2) =>
|
||||
t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
|
||||
}
|
||||
|
||||
@@ -20,6 +20,7 @@ trait RepositorySearchService { self: IssuesService =>
|
||||
searchIssuesByKeyword(owner, repository, query).map { case (issue, commentCount, content) =>
|
||||
IssueSearchResult(
|
||||
issue.issueId,
|
||||
issue.isPullRequest,
|
||||
issue.title,
|
||||
issue.openedUserName,
|
||||
issue.registeredDate,
|
||||
@@ -111,6 +112,7 @@ object RepositorySearchService {
|
||||
|
||||
case class IssueSearchResult(
|
||||
issueId: Int,
|
||||
isPullRequest: Boolean,
|
||||
title: String,
|
||||
openedUserName: String,
|
||||
registeredDate: java.util.Date,
|
||||
|
||||
Reference in New Issue
Block a user