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

(refs #2)Recover "New Request" button which has been removed temporary while implementing dashboard.

Browse Source
This commit is contained in:
takezoe
2013-08-08 02:06:55 +09:00
parent 5930cf48d5
commit c071284a56
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,7 +103,9 @@ trait DashboardControllerBase extends ControllerBase {
page, page,
countIssue(condition.copy(state = "open"), filterUser, true, repositories: _*), countIssue(condition.copy(state = "open"), filterUser, true, repositories: _*),
countIssue(condition.copy(state = "closed"), filterUser, true, repositories: _*), countIssue(condition.copy(state = "closed"), filterUser, true, repositories: _*),
condition), condition,
None,
false),
getPullRequestCountGroupByUser(condition.state == "closed", userName, None), getPullRequestCountGroupByUser(condition.state == "closed", userName, None),
getRepositoryNamesOfUser(userName).map { RepoName => getRepositoryNamesOfUser(userName).map { RepoName =>
(userName, RepoName, counts.collectFirst { case (_, RepoName, count) => count }.getOrElse(0)) (userName, RepoName, counts.collectFirst { case (_, RepoName, count) => count }.getOrElse(0))

4
src/main/twirl/pulls/list.scala.html
View File

@@ -24,7 +24,7 @@
@if(loginAccount.isDefined){ @if(loginAccount.isDefined){
<li@if(filter.map(_ == loginAccount.get.userName).getOrElse(false)){ class="active"}> <li@if(filter.map(_ == loginAccount.get.userName).getOrElse(false)){ class="active"}>
<a href="@url(repository)/pulls/@loginAccount.map(_.userName)"> <a href="@url(repository)/pulls/@loginAccount.map(_.userName)">
<span class="count-right">@counts.find(_.userName == loginAccount.get.userName).map(_.count)</span> <span class="count-right">@counts.find(_.userName == loginAccount.get.userName).map(_.count).getOrElse(0)</span>
Yours Yours
</a> </a>
</li> </li>
@@ -44,7 +44,7 @@
} }
</ul> </ul>
</div> </div>
@listparts(issues, page, openCount, closedCount, condition) @listparts(issues, page, openCount, closedCount, condition, Some(repository), hasWritePermission)
</div> </div>
} }

8
src/main/twirl/pulls/listparts.scala.html
View File

@@ -2,18 +2,20 @@
page: Int, page: Int,
openCount: Int, openCount: Int,
closedCount: Int, closedCount: Int,
condition: service.IssuesService.IssueSearchCondition)(implicit context: app.Context) condition: service.IssuesService.IssueSearchCondition,
repository: Option[service.RepositoryService.RepositoryInfo],
hasWritePermission: Boolean)(implicit context: app.Context)
@import context._ @import context._
@import view.helpers._ @import view.helpers._
<div class="span9"> <div class="span9">
@* @repository.map { repository =>
@if(hasWritePermission){ @if(hasWritePermission){
<div class="pull-right"> <div class="pull-right">
@helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.PullRequestService.PullRequestLimit, 7, condition.toURL) @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.PullRequestService.PullRequestLimit, 7, condition.toURL)
<a href="@url(repository)/compare" class="btn btn-success">New pull request</a> <a href="@url(repository)/compare" class="btn btn-success">New pull request</a>
</div> </div>
} }
*@ }
<div class="btn-group"> <div class="btn-group">
<a class="btn@if(condition.state == "open"){ active}" href="@condition.copy(state = "open").toURL">@openCount Open</a> <a class="btn@if(condition.state == "open"){ active}" href="@condition.copy(state = "open").toURL">@openCount Open</a>
<a class="btn@if(condition.state == "closed"){ active}" href="@condition.copy(state = "closed").toURL">@closedCount Closed</a> <a class="btn@if(condition.state == "closed"){ active}" href="@condition.copy(state = "closed").toURL">@closedCount Closed</a>