diff --git a/src/main/twirl/issues/issue.scala.html b/src/main/twirl/issues/issue.scala.html index 9248ec2..b4822c8 100644 --- a/src/main/twirl/issues/issue.scala.html +++ b/src/main/twirl/issues/issue.scala.html @@ -42,7 +42,7 @@ @commentform(issue, true, hasWritePermission, repository)
- @issueinfo(issue, issueLabels, collaborators, milestones, labels, hasWritePermission, repository) + @issueinfo(issue, comments, issueLabels, collaborators, milestones, labels, hasWritePermission, repository)
diff --git a/src/main/twirl/issues/issueinfo.scala.html b/src/main/twirl/issues/issueinfo.scala.html index 6497b61..47ceebc 100644 --- a/src/main/twirl/issues/issueinfo.scala.html +++ b/src/main/twirl/issues/issueinfo.scala.html @@ -1,4 +1,5 @@ @(issue: model.Issue, + comments: List[model.IssueComment], issueLabels: List[model.Label], collaborators: List[String], milestones: List[(model.Milestone, Int, Int)], @@ -30,22 +31,8 @@
Milestone -
- - @issue.milestoneId.map { milestoneId => - @milestones.collect { case (milestone, _, _) if(milestone.milestoneId == milestoneId) => - Milestone: @milestone.title - } - }.getOrElse("No milestone") - -
- @issue.milestoneId.map { milestoneId => - @milestones.collect { case (milestone, openCount, closeCount) if(milestone.milestoneId == milestoneId) => - @issues.milestones.html.progress(openCount + closeCount, closeCount) - } - } -
- @if(hasWritePermission){ + @if(hasWritePermission){ +
@helper.html.dropdown() {
  • Clear this milestone
    • @milestones.filter(_._1.closedDate.isEmpty).map { case (milestone, _, _) => @@ -67,31 +54,53 @@ } } - } -
    +
    + }
    -
    -
    - Assignee - - @issue.assignedUserName.map { userName => - @avatar(userName, 20) @user(userName, styleClass="username strong") is assigned - }.getOrElse("No one is assigned") - - @if(hasWritePermission){ - @helper.html.dropdown() { -
  • Clear assignee
    • - @collaborators.map { collaborator => -
  • - - @helper.html.checkicon(Some(collaborator) == issue.assignedUserName)@avatar(collaborator, 20) @collaborator - -
    • - } +
    + @issue.milestoneId.map { milestoneId => + @milestones.collect { case (milestone, openCount, closeCount) if(milestone.milestoneId == milestoneId) => + @issues.milestones.html.progress(openCount + closeCount, closeCount) } }
    - + + @issue.milestoneId.map { milestoneId => + @milestones.collect { case (milestone, _, _) if(milestone.milestoneId == milestoneId) => + @milestone.title + } + }.getOrElse(No milestone) + +
    +
    + Assignee + @if(hasWritePermission){ +
    + @helper.html.dropdown() { +
  • Clear assignee
    • + @collaborators.map { collaborator => +
  • + + @helper.html.checkicon(Some(collaborator) == issue.assignedUserName)@avatar(collaborator, 20) @collaborator + +
    • + } + } +
    + } +
    + + @issue.assignedUserName.map { userName => + @avatar(userName, 20) @user(userName, styleClass="username strong") + }.getOrElse(No one) + +
    +
    + @defining((issue.openedUserName :: comments.map(_.commentedUserName)).distinct){ participants => +
    @participants.size @plural(participants.size, "participant")
    + @participants.map { participant => @avatarLink(participant, 20, tooltip = true) } + } +