Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-01 02:56:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #3)Separate search actions to SearchController.

Browse Source
This commit is contained in:
takezoe
2013-07-22 17:28:13 +09:00
parent 6fd1a990ae
commit ace5d7de9e
5 changed files with 59 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/service/IssuesService.scala
View File

@@ -255,7 +255,7 @@ trait IssuesService {
(t.title.toLowerCase like (s"%${likeEncode(keyword)}%", '^')) ||
(t.content.toLowerCase like (s"%${likeEncode(keyword)}%", '^'))
} .reduceLeft(_ && _)
}.map { t => (t, 0, t.content) }
}.map { t => (t, 0, t.content.?) }
// Search IssueComment
val comments = Query(IssueComments).innerJoin(Issues).on { case (t1, t2) =>
@@ -264,7 +264,7 @@ trait IssuesService {
keywords.map { query =>
t1.content.toLowerCase like (s"%${likeEncode(query)}%", '^')
}.reduceLeft(_ && _)
}.map { case (t1, t2) => (t2, t1.commentId, t1.content) }
}.map { case (t1, t2) => (t2, t1.commentId, t1.content.?) }
def getCommentCount(issue: Issue): Int = {
Query(IssueComments)
@@ -282,7 +282,7 @@ trait IssuesService {
issue1.issueId == issue2.issueId
}.map { result =>
val (issue, _, content) = result.head
(issue, getCommentCount(issue) , content)
(issue, getCommentCount(issue) , content.getOrElse(""))
}.toList
}