diff --git a/src/main/scala/app/DashboardController.scala b/src/main/scala/app/DashboardController.scala index 038f8c3..dbda3cf 100644 --- a/src/main/scala/app/DashboardController.scala +++ b/src/main/scala/app/DashboardController.scala @@ -103,7 +103,9 @@ 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)) diff --git a/src/main/twirl/pulls/list.scala.html b/src/main/twirl/pulls/list.scala.html index 27ec623..6c0b3e4 100644 --- a/src/main/twirl/pulls/list.scala.html +++ b/src/main/twirl/pulls/list.scala.html @@ -24,7 +24,7 @@ @if(loginAccount.isDefined){ - @counts.find(_.userName == loginAccount.get.userName).map(_.count) + @counts.find(_.userName == loginAccount.get.userName).map(_.count).getOrElse(0) Yours @@ -44,7 +44,7 @@ } - @listparts(issues, page, openCount, closedCount, condition) + @listparts(issues, page, openCount, closedCount, condition, Some(repository), hasWritePermission) } diff --git a/src/main/twirl/pulls/listparts.scala.html b/src/main/twirl/pulls/listparts.scala.html index e3dfac4..0cd8918 100644 --- a/src/main/twirl/pulls/listparts.scala.html +++ b/src/main/twirl/pulls/listparts.scala.html @@ -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._
- @* - @if(hasWritePermission){ -
- @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.PullRequestService.PullRequestLimit, 7, condition.toURL) - New pull request -
+ @repository.map { repository => + @if(hasWritePermission){ +
+ @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.PullRequestService.PullRequestLimit, 7, condition.toURL) + New pull request +
+ } } - *@