diff --git a/src/main/scala/app/IssuesController.scala b/src/main/scala/app/IssuesController.scala index 943c124..97af6cd 100644 --- a/src/main/scala/app/IssuesController.scala +++ b/src/main/scala/app/IssuesController.scala @@ -379,6 +379,7 @@ ) issues.html.list( + "issues", searchIssue(condition, false, (page - 1) * IssueLimit, IssueLimit, owner -> repoName), page, (getCollaborators(owner, repoName) :+ owner).sorted, diff --git a/src/main/scala/app/PullRequestsController.scala b/src/main/scala/app/PullRequestsController.scala index 5ed2d07..2f9aba5 100644 --- a/src/main/scala/app/PullRequestsController.scala +++ b/src/main/scala/app/PullRequestsController.scala @@ -458,7 +458,8 @@ else session.getAs[IssueSearchCondition](sessionKey).getOrElse(IssueSearchCondition()) ) - pulls.html.list( + issues.html.list( + "pulls", searchIssue(condition, true, (page - 1) * PullRequestLimit, PullRequestLimit, owner -> repoName), page, (getCollaborators(owner, repoName) :+ owner).sorted, diff --git a/src/main/twirl/issues/list.scala.html b/src/main/twirl/issues/list.scala.html index a826ac7..4deecb7 100644 --- a/src/main/twirl/issues/list.scala.html +++ b/src/main/twirl/issues/list.scala.html @@ -1,4 +1,5 @@ -@(issues: List[service.IssuesService.IssueInfo], +@(target: String, + issues: List[service.IssuesService.IssueInfo], page: Int, collaborators: List[String], milestones: List[model.Milestone], @@ -12,7 +13,7 @@ @import view.helpers._ @html.main(s"Issues - ${repository.owner}/${repository.name}", Some(repository)){ @html.menu("issues", repository){ - @tab("issues", false, repository) + @tab(target, false, repository)
-
- @openCount Open
- @closedCount Closed
-
- @helper.html.dropdown("Author", flat = true) {
- @collaborators.map { collaborator =>
-
- @if(hasWritePermission){
-
- @helper.html.dropdown("Mark as", flat = true) {
-
- }
- |
-
---|
- No pull requests to show. - | -
- @if(hasWritePermission){
-
- }
-
- #@issue.issueId opened by @user(issue.openedUserName, styleClass="username") @datetime(issue.registeredDate)
- @milestone
-
- |
-