Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 21:45:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #33)Small fix for pull request #45.

Browse Source
This commit is contained in:
takezoe
2013-07-22 12:25:28 +09:00
parent be78d93c1f
commit 5a9645829d
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/scala/app/IssuesController.scala
View File

@@ -62,12 +62,9 @@ trait IssuesControllerBase extends ControllerBase {
val issueId = params("id") val issueId = params("id")
getIssue(owner, name, issueId) map { getIssue(owner, name, issueId) map {
val comments = getComments(owner, name, issueId.toInt)
val participantSet = comments.foldRight(Set(owner)) { (comment, set) => set + comment.commentedUserName }
issues.html.issue( issues.html.issue(
_, _,
comments, getComments(owner, name, issueId.toInt),
participantSet,
getIssueLabels(owner, name, issueId.toInt), getIssueLabels(owner, name, issueId.toInt),
(getCollaborators(owner, name) :+ owner).sorted, (getCollaborators(owner, name) :+ owner).sorted,
getMilestones(owner, name), getMilestones(owner, name),

7
src/main/twirl/issues/issue.scala.html
View File

@@ -1,6 +1,5 @@
@(issue: model.Issue, @(issue: model.Issue,
comments: List[model.IssueComment], comments: List[model.IssueComment],
participants: Set[String],
issueLabels: List[model.Label], issueLabels: List[model.Label],
collaborators: List[String], collaborators: List[String],
milestones: List[model.Milestone], milestones: List[model.Milestone],
@@ -83,8 +82,10 @@
</div> </div>
</div> </div>
<div class="issue-participants"> <div class="issue-participants">
@participants.size participants @defining((issue.openedUserName :: comments.map(_.commentedUserName)).distinct){ participants =>
@participants.map { participant => @avatar(participant, 20) } <strong>@participants.size</strong> @plural(participants.size, "participant")
@participants.map { participant => <a href="@url(participant)">@avatar(participant, 20, tooltip = true)</a> }
}
</div> </div>
@comments.map { comment => @comments.map { comment =>
@if(comment.action != "close" && comment.action != "reopen"){ @if(comment.action != "close" && comment.action != "reopen"){