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)
@listparts(issues, page, openCount, closedCount, condition, collaborators, milestones, labels, Some(repository), hasWritePermission) @@ -22,7 +23,7 @@
- +
} } diff --git a/src/main/twirl/pulls/list.scala.html b/src/main/twirl/pulls/list.scala.html deleted file mode 100644 index 2731996..0000000 --- a/src/main/twirl/pulls/list.scala.html +++ /dev/null @@ -1,67 +0,0 @@ -@(issues: List[service.IssuesService.IssueInfo], - page: Int, - collaborators: List[String], - milestones: List[model.Milestone], - labels: List[model.Label], - openCount: Int, - closedCount: Int, - condition: service.IssuesService.IssueSearchCondition, - repository: service.RepositoryService.RepositoryInfo, - hasWritePermission: Boolean)(implicit context: app.Context) -@import context._ -@import view.helpers._ -@import service.IssuesService.IssueInfo -@html.main(s"Pull Requests - ${repository.owner}/${repository.name}", Some(repository)){ - @html.menu("pulls", repository){ - @_root_.issues.html.tab("pulls", false, repository) -
-
- @listparts(issues, page, openCount, closedCount, condition, collaborators, milestones, labels, Some(repository), hasWritePermission) -
-
- @if(hasWritePermission){ -
- - - -
- } - } -} -@if(hasWritePermission){ - -} diff --git a/src/main/twirl/pulls/listparts.scala.html b/src/main/twirl/pulls/listparts.scala.html deleted file mode 100644 index 0c7fa12..0000000 --- a/src/main/twirl/pulls/listparts.scala.html +++ /dev/null @@ -1,166 +0,0 @@ -@(issues: List[service.IssuesService.IssueInfo], - page: Int, - openCount: Int, - closedCount: Int, - condition: service.IssuesService.IssueSearchCondition, - collaborators: List[String] = Nil, - milestones: List[model.Milestone] = Nil, - labels: List[model.Label] = Nil, - repository: Option[service.RepositoryService.RepositoryInfo], - hasWritePermission: Boolean)(implicit context: app.Context) -@import context._ -@import view.helpers._ -@import service.IssuesService.IssueInfo - - - - - @if(issues.isEmpty){ - - - - } - @issues.map { case IssueInfo(issue, labels, milestone, commentCount) => - - - - } -
- - @openCount Open - @closedCount Closed -
- @helper.html.dropdown("Author", flat = true) { - @collaborators.map { collaborator => -
  • - - @helper.html.checkicon(condition.author == Some(collaborator)) - @avatar(collaborator, 20) @collaborator - -
  • - } - } - @helper.html.dropdown("Label", flat = true) { - @labels.map { label => -
  • - - @helper.html.checkicon(condition.labels.contains(label.labelName)) -    - @label.labelName - -
  • - } - } - @helper.html.dropdown("Milestone", flat = true) { -
  • - - @helper.html.checkicon(condition.milestoneId == Some(None)) Issues with no milestone - -
  • - @milestones.filter(_.closedDate.isEmpty).map { milestone => -
  • - - @helper.html.checkicon(condition.milestoneId == Some(Some(milestone.milestoneId))) @milestone.title - -
  • - } - } - @helper.html.dropdown("Assignee", flat = true) { - @collaborators.map { collaborator => -
  • - - @helper.html.checkicon(condition.assigned == Some(collaborator)) - @avatar(collaborator, 20) @collaborator - -
  • - } - } - @helper.html.dropdown("Sort", flat = true){ -
  • - - @helper.html.checkicon(condition.sort == "created" && condition.direction == "desc") Newest - -
  • -
  • - - @helper.html.checkicon(condition.sort == "created" && condition.direction == "asc") Oldest - -
  • -
  • - - @helper.html.checkicon(condition.sort == "comments" && condition.direction == "desc") Most commented - -
  • -
  • - - @helper.html.checkicon(condition.sort == "comments" && condition.direction == "asc") Least commented - -
  • -
  • - - @helper.html.checkicon(condition.sort == "updated" && condition.direction == "desc") Recently updated - -
  • -
  • - - @helper.html.checkicon(condition.sort == "updated" && condition.direction == "asc") Least recently updated - -
  • - } -
    - @if(hasWritePermission){ -
    - @helper.html.dropdown("Mark as", flat = true) { -
  • Open
  • -
  • Close
  • - } - @helper.html.dropdown("Label", flat = true) { - @labels.map { label => -
  • - - -   - @label.labelName - -
  • - } - } - @helper.html.dropdown("Milestone", flat = true) { -
  • No milestone
  • - @milestones.filter(_.closedDate.isEmpty).map { milestone => -
  • @milestone.title
  • - } - } - @helper.html.dropdown("Assignee", flat = true) { -
  • Clear assignee
  • - @collaborators.map { collaborator => -
  • @avatar(collaborator, 20) @collaborator
  • - } - } -
    - } -
    - No pull requests to show. -
    - @if(hasWritePermission){ - - } - - @issue.title - @labels.map { label => - @label.labelName - } - - @issue.assignedUserName.map { userName => - @avatar(userName, 20, tooltip = true) - } - @commentCount - -
    - #@issue.issueId opened by @user(issue.openedUserName, styleClass="username") @datetime(issue.registeredDate) - @milestone -
    -
    -
    - @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.PullRequestService.PullRequestLimit, 10, condition.toURL) -
    \ No newline at end of file