mirror of
https://github.com/gitbucket/gitbucket.git
synced 2025-11-07 05:55:51 +01:00
(refs #2)Recover "New Request" button which has been removed temporary while implementing dashboard.
This commit is contained in:
@@ -103,7 +103,9 @@ trait DashboardControllerBase extends ControllerBase {
|
||||
page,
|
||||
countIssue(condition.copy(state = "open"), filterUser, true, repositories: _*),
|
||||
countIssue(condition.copy(state = "closed"), filterUser, true, repositories: _*),
|
||||
condition),
|
||||
condition,
|
||||
None,
|
||||
false),
|
||||
getPullRequestCountGroupByUser(condition.state == "closed", userName, None),
|
||||
getRepositoryNamesOfUser(userName).map { RepoName =>
|
||||
(userName, RepoName, counts.collectFirst { case (_, RepoName, count) => count }.getOrElse(0))
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
@if(loginAccount.isDefined){
|
||||
<li@if(filter.map(_ == loginAccount.get.userName).getOrElse(false)){ class="active"}>
|
||||
<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
|
||||
</a>
|
||||
</li>
|
||||
@@ -44,7 +44,7 @@
|
||||
}
|
||||
</ul>
|
||||
</div>
|
||||
@listparts(issues, page, openCount, closedCount, condition)
|
||||
@listparts(issues, page, openCount, closedCount, condition, Some(repository), hasWritePermission)
|
||||
</div>
|
||||
}
|
||||
|
||||
|
||||
@@ -2,18 +2,20 @@
|
||||
page: Int,
|
||||
openCount: 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 view.helpers._
|
||||
<div class="span9">
|
||||
@*
|
||||
@repository.map { repository =>
|
||||
@if(hasWritePermission){
|
||||
<div class="pull-right">
|
||||
@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>
|
||||
</div>
|
||||
}
|
||||
*@
|
||||
}
|
||||
<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 == "closed"){ active}" href="@condition.copy(state = "closed").toURL">@closedCount Closed</a>
|
||||
|
||||
Reference in New Issue
Block a user