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

Label search is available.

Browse Source
This commit is contained in:
takezoe
2013-06-26 23:05:23 +09:00
parent 4bceb5910e
commit 1d67ae69c5
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -116,14 +116,24 @@ trait IssuesService {
* Assembles query for conditional issue searching.
*/
private def searchIssueQuery(owner: String, repository: String, condition: IssueSearchCondition, filter: String, userName: Option[String]) =
Query(Issues) filter { t =>
(t.userName is owner.bind) &&
(t.repositoryName is repository.bind) &&
(t.closed is (condition.state == "closed").bind) &&
(t.milestoneId is condition.milestoneId.get.bind, condition.milestoneId.isDefined) &&
//if(condition.labels.nonEmpty) Some(Query(Issue)) else None,
(t.assignedUserName is userName.get.bind, filter == "assigned") &&
(t.openedUserName is userName.get.bind, filter == "created_by")
Query(Issues) filter { t1 =>
(t1.userName is owner.bind) &&
(t1.repositoryName is repository.bind) &&
(t1.closed is (condition.state == "closed").bind) &&
(t1.milestoneId is condition.milestoneId.get.bind, condition.milestoneId.isDefined) &&
(t1.assignedUserName is userName.get.bind, filter == "assigned") &&
(t1.openedUserName is userName.get.bind, filter == "created_by") &&
(IssueLabels filter { t2 =>
(t2.userName is t1.userName) &&
(t2.repositoryName is t1.repositoryName) &&
(t2.issueId is t1.issueId) &&
(t2.labelId in
(Labels filter { t3 =>
(t3.userName is t1.userName) &&
(t3.repositoryName is t1.repositoryName) &&
(t3.labelName inSetBind condition.labels)
} map(_.labelId)))
} exists, condition.labels.nonEmpty)
}
def saveIssue(owner: String, repository: String, loginUser: String,