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

(refs #488)Merge user filter into IssueSearchCondition

Browse Source
This commit is contained in:
Naoki Takezoe
2014-09-22 10:08:22 +09:00
parent 706fa77de3
commit 90487eb7b7
8 changed files with 147 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/app/PullRequestsController.scala
View File

@@ -464,13 +464,13 @@ trait PullRequestsControllerBase extends ControllerBase {
)
pulls.html.list(
searchIssue(condition, filterUser, true, (page - 1) * PullRequestLimit, PullRequestLimit, owner -> repoName),
searchIssue(condition, true, (page - 1) * PullRequestLimit, PullRequestLimit, owner -> repoName),
getPullRequestCountGroupByUser(condition.state == "closed", Some(owner), Some(repoName)),
userName,
page,
countIssue(condition.copy(state = "open" ), filterUser, true, owner -> repoName),
countIssue(condition.copy(state = "closed"), filterUser, true, owner -> repoName),
countIssue(condition, Map.empty, true, owner -> repoName),
countIssue(condition.copy(state = "open" ), true, owner -> repoName),
countIssue(condition.copy(state = "closed"), true, owner -> repoName),
countIssue(condition.copy(assigned = None, author = None), true, owner -> repoName),
condition,
repository,
hasWritePermission(owner, repoName, context.loginAccount))