diff --git a/src/main/scala/app/IssuesController.scala b/src/main/scala/app/IssuesController.scala index 0c66bc7..943c124 100644 --- a/src/main/scala/app/IssuesController.scala +++ b/src/main/scala/app/IssuesController.scala @@ -287,7 +287,10 @@ private def executeBatch(repository: RepositoryService.RepositoryInfo)(execute: Int => Unit) = { params("checked").split(',') map(_.toInt) foreach execute - redirect(s"/${repository.owner}/${repository.name}/issues") + params("from") match { + case "issues" => redirect(s"/${repository.owner}/${repository.name}/issues") + case "pulls" => redirect(s"/${repository.owner}/${repository.name}/pulls") + } } private def createReferComment(owner: String, repository: String, fromIssue: Issue, message: String) = { diff --git a/src/main/twirl/issues/list.scala.html b/src/main/twirl/issues/list.scala.html index 98bbe91..a826ac7 100644 --- a/src/main/twirl/issues/list.scala.html +++ b/src/main/twirl/issues/list.scala.html @@ -22,6 +22,7 @@
+
} } diff --git a/src/main/twirl/pulls/list.scala.html b/src/main/twirl/pulls/list.scala.html index 8dbe811..520d29e 100644 --- a/src/main/twirl/pulls/list.scala.html +++ b/src/main/twirl/pulls/list.scala.html @@ -24,6 +24,7 @@
+
} } diff --git a/src/main/twirl/pulls/listparts.scala.html b/src/main/twirl/pulls/listparts.scala.html index 35eb66f..0c7fa12 100644 --- a/src/main/twirl/pulls/listparts.scala.html +++ b/src/main/twirl/pulls/listparts.scala.html @@ -96,35 +96,37 @@ } -
- @helper.html.dropdown("Mark as", flat = true) { -
  • Open
  • -
  • Close
  • - } - @helper.html.dropdown("Label", flat = true) { - @labels.map { label => -
  • - - -   - @label.labelName - -
  • + @if(hasWritePermission){ +
    + @helper.html.dropdown("Mark as", flat = true) { +
  • Open
  • +
  • Close
  • } - } - @helper.html.dropdown("Milestone", flat = true) { -
  • No milestone
  • - @milestones.filter(_.closedDate.isEmpty).map { milestone => -
  • @milestone.title
  • + @helper.html.dropdown("Label", flat = true) { + @labels.map { label => +
  • + + +   + @label.labelName + +
  • + } } - } - @helper.html.dropdown("Assignee", flat = true) { -
  • Clear assignee
  • - @collaborators.map { collaborator => -
  • @avatar(collaborator, 20) @collaborator
  • + @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
  • + } + } +
    + } @if(issues.isEmpty){