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

(refs #3)Fix issue search condition.

Browse Source
This commit is contained in:
takezoe
2013-07-17 21:18:09 +09:00
parent d46e90dcdb
commit 69ec4175eb
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -239,19 +239,21 @@ trait IssuesService {
def queryIssues(owner: String, repository: String, query: String): List[(Issue, Int, String)] = { def queryIssues(owner: String, repository: String, query: String): List[(Issue, Int, String)] = {
val lowerQueries = StringUtil.splitWords(query.toLowerCase) val lowerQueries = StringUtil.splitWords(query.toLowerCase)
// Search Issue
val issues = Query(Issues).filter { t => val issues = Query(Issues).filter { t =>
lowerQueries.map { query => lowerQueries.map { query =>
(t.title.toLowerCase startsWith query) || (t.content.toLowerCase startsWith query) (t.title.toLowerCase like '%' + query + '%') || (t.content.toLowerCase like '%' + query + '%') // TODO escape!!!!
} .reduceLeft { (a, b) => } .reduceLeft { (a, b) =>
a && b a && b
} }
}.map { t => (t, 0, t.content) } }.map { t => (t, 0, t.content) }
// Search IssueComment
val comments = Query(IssueComments).innerJoin(Issues).on { case (t1, t2) => val comments = Query(IssueComments).innerJoin(Issues).on { case (t1, t2) =>
t1.byIssue(t2.userName, t2.repositoryName, t2.issueId) t1.byIssue(t2.userName, t2.repositoryName, t2.issueId)
}.filter { case (t1, t2) => }.filter { case (t1, t2) =>
lowerQueries.map { query => lowerQueries.map { query =>
t1.content.toLowerCase startsWith query t1.content.toLowerCase like '%' + query + '%' // TODO escape!!!!
}.reduceLeft { (a, b) => }.reduceLeft { (a, b) =>
a && b a && b
} }