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

(refs #529)Organization filter

Browse Source
This commit is contained in:
Naoki Takezoe
2014-11-02 13:26:46 +09:00
parent 4bc4a16a80
commit 2db674bb03
8 changed files with 105 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,8 @@ class DashboardController extends DashboardControllerBase
with UsersAuthenticator
trait DashboardControllerBase extends ControllerBase {
self: IssuesService with PullRequestService with RepositoryService with UsersAuthenticator =>
self: IssuesService with PullRequestService with RepositoryService with AccountService
with UsersAuthenticator =>
get("/dashboard/issues/repos")(usersOnly {
searchIssues("created_by")
@@ -59,7 +60,8 @@ trait DashboardControllerBase extends ControllerBase {
countIssue(condition.copy(state = "open" ), filterUser, false, userRepos: _*),
countIssue(condition.copy(state = "closed"), filterUser, false, userRepos: _*),
condition,
filter)
filter,
getGroupNames(userName))
}
private def searchPullRequests(filter: String, repository: Option[String]) = {
@@ -83,7 +85,8 @@ trait DashboardControllerBase extends ControllerBase {
countIssue(condition.copy(state = "open" ), filterUser, true, allRepos: _*),
countIssue(condition.copy(state = "closed"), filterUser, true, allRepos: _*),
condition,
filter)
filter,
getGroupNames(userName))
}