From bb63a8d14cd19b61917aaa7a95c0ffb09ee61ec2 Mon Sep 17 00:00:00 2001 From: Naoki Takezoe Date: Tue, 23 Sep 2014 17:23:52 +0900 Subject: [PATCH] (refs #488)Remove unnecessary template arguments --- src/main/scala/app/IssuesController.scala | 6 +----- src/main/scala/app/PullRequestsController.scala | 1 - src/main/twirl/issues/list.scala.html | 4 ---- src/main/twirl/pulls/list.scala.html | 1 - 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/main/scala/app/IssuesController.scala b/src/main/scala/app/IssuesController.scala index f47f480dc..0c66bc7f4 100644 --- a/src/main/scala/app/IssuesController.scala +++ b/src/main/scala/app/IssuesController.scala @@ -381,12 +381,8 @@ trait IssuesControllerBase extends ControllerBase { (getCollaborators(owner, repoName) :+ owner).sorted, getMilestones(owner, repoName), getLabels(owner, repoName), - countIssue(condition.copy(state = "open"), false, owner -> repoName), + countIssue(condition.copy(state = "open" ), false, owner -> repoName), countIssue(condition.copy(state = "closed"), false, owner -> repoName), - countIssue(condition.copy(assigned = None, author = None), false, owner -> repoName), - context.loginAccount.map(x => countIssue(condition.copy(assigned = Some(x.userName), author = None), false, owner -> repoName)), - context.loginAccount.map(x => countIssue(condition.copy(assigned = None, author = Some(x.userName)), false, owner -> repoName)), - countIssueGroupByLabels(owner, repoName, condition), condition, repository, hasWritePermission(owner, repoName, context.loginAccount)) diff --git a/src/main/scala/app/PullRequestsController.scala b/src/main/scala/app/PullRequestsController.scala index 55a63ada5..7d611a2d8 100644 --- a/src/main/scala/app/PullRequestsController.scala +++ b/src/main/scala/app/PullRequestsController.scala @@ -467,7 +467,6 @@ trait PullRequestsControllerBase extends ControllerBase { getLabels(owner, repoName), countIssue(condition.copy(state = "open" ), true, owner -> repoName), countIssue(condition.copy(state = "closed"), true, owner -> repoName), - countIssue(condition.copy(assigned = None, author = None), true, owner -> repoName), condition, repository, hasWritePermission(owner, repoName, context.loginAccount)) diff --git a/src/main/twirl/issues/list.scala.html b/src/main/twirl/issues/list.scala.html index 024a2c096..98bbe91e1 100644 --- a/src/main/twirl/issues/list.scala.html +++ b/src/main/twirl/issues/list.scala.html @@ -5,10 +5,6 @@ labels: List[model.Label], openCount: Int, closedCount: Int, - allCount: Int, - assignedCount: Option[Int], - createdByCount: Option[Int], - labelCounts: Map[String, Int], condition: service.IssuesService.IssueSearchCondition, repository: service.RepositoryService.RepositoryInfo, hasWritePermission: Boolean)(implicit context: app.Context) diff --git a/src/main/twirl/pulls/list.scala.html b/src/main/twirl/pulls/list.scala.html index 5d184ecb8..8dbe8111f 100644 --- a/src/main/twirl/pulls/list.scala.html +++ b/src/main/twirl/pulls/list.scala.html @@ -6,7 +6,6 @@ labels: List[model.Label], openCount: Int, closedCount: Int, - allCount: Int, condition: service.IssuesService.IssueSearchCondition, repository: service.RepositoryService.RepositoryInfo, hasWritePermission: Boolean)(implicit context: app.Context)