Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-08 14:35:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Applying new Issues UI to dashboard

Browse Source
This commit is contained in:
Naoki Takezoe
2014-10-19 21:34:12 +09:00
parent 8764910553
commit 13c206d068
3 changed files with 119 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@ trait DashboardControllerBase extends ControllerBase {
self: IssuesService with PullRequestService with RepositoryService with UsersAuthenticator =>
get("/dashboard/issues/repos")(usersOnly {
searchIssues("all")
searchIssues("created_by")
})
get("/dashboard/issues/assigned")(usersOnly {
@@ -54,19 +54,12 @@ trait DashboardControllerBase extends ControllerBase {
val page = IssueSearchCondition.page(request)
dashboard.html.issues(
dashboard.html.issueslist(
searchIssue(condition, filterUser, false, (page - 1) * IssueLimit, IssueLimit, userRepos: _*),
page,
countIssue(condition.copy(state = "open" ), filterUser, false, userRepos: _*),
countIssue(condition.copy(state = "closed"), filterUser, false, userRepos: _*),
condition),
countIssue(condition.copy(assigned = None, author = None), filterUser, false, userRepos: _*),
countIssue(condition.copy(assigned = Some(userName), author = None), filterUser, false, userRepos: _*),
countIssue(condition.copy(assigned = None, author = Some(userName)), filterUser, false, userRepos: _*),
countIssueGroupByRepository(condition, filterUser, false, userRepos: _*),
condition,
filter)
searchIssue(condition, filterUser, false, (page - 1) * IssueLimit, IssueLimit, userRepos: _*),
page,
countIssue(condition.copy(state = "open" ), filterUser, false, userRepos: _*),
countIssue(condition.copy(state = "closed"), filterUser, false, userRepos: _*),
condition,
filter)
}
private def searchPullRequests(filter: String, repository: Option[String]) = {