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

(refs #406)Fix pull request count in the dashboard

Browse Source
This commit is contained in:
Naoki Takezoe
2014-06-16 01:40:51 +09:00
parent 8ed4075f1e
commit 4f45e047d2
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/app/DashboardController.scala
View File

@@ -96,7 +96,7 @@ trait DashboardControllerBase extends ControllerBase {
condition,
None,
false),
getPullRequestCountGroupByUser(condition.state == "closed", userName, None),
getPullRequestCountGroupByUser(condition.state == "closed", None, None),
getRepositoryNamesOfUser(userName).map { RepoName =>
(userName, RepoName, counts.collectFirst { case (_, RepoName, count) => count }.getOrElse(0))
}.sortBy(_._3).reverse,

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

@@ -466,7 +466,7 @@ trait PullRequestsControllerBase extends ControllerBase {
pulls.html.list(
searchIssue(condition, filterUser, true, (page - 1) * PullRequestLimit, PullRequestLimit, owner -> repoName),
getPullRequestCountGroupByUser(condition.state == "closed", owner, Some(repoName)),
getPullRequestCountGroupByUser(condition.state == "closed", Some(owner), Some(repoName)),
userName,
page,
countIssue(condition.copy(state = "open" ), filterUser, true, owner -> repoName),