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

(refs #2)Fix merged message in the comment list.

Browse Source
This commit is contained in:
takezoe
2013-08-06 12:34:28 +09:00
parent 11371c9e4f
commit 52f3a90d18
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/twirl/issues/commentlist.scala.html
View File

@@ -1,6 +1,8 @@
@(comments: List[model.IssueComment], @(issue: model.Issue,
comments: List[model.IssueComment],
hasWritePermission: Boolean, hasWritePermission: Boolean,
repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context) repository: service.RepositoryService.RepositoryInfo,
pullreq: Option[model.PullRequest] = None)(implicit context: app.Context)
@import context._ @import context._
@import view.helpers._ @import view.helpers._
@comments.map { comment => @comments.map { comment =>
@@ -26,14 +28,20 @@
<div class="small" style="margin-top: 10px; margin-bottom: 10px;"> <div class="small" style="margin-top: 10px; margin-bottom: 10px;">
<span class="label label-info">Merged</span> <span class="label label-info">Merged</span>
@avatar(comment.commentedUserName, 20) @avatar(comment.commentedUserName, 20)
<a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> merged the pull request @datetime(comment.registeredDate) <a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> merged commit <code>@pullreq.map(_.commitIdTo.substring(0, 7))</code>
<span class="label label-info monospace">@pullreq.map(_.requestUserName):@pullreq.map(_.requestBranch)</span> to <span class="label label-info monospace">@pullreq.map(_.userName):@pullreq.map(_.branch)</span>
@datetime(comment.registeredDate)
</div> </div>
} }
@if(comment.action == "close" || comment.action == "close_comment"){ @if(comment.action == "close" || comment.action == "close_comment"){
<div class="small issue-comment-action"> <div class="small issue-comment-action">
<span class="label label-important">Closed</span> <span class="label label-important">Closed</span>
@avatar(comment.commentedUserName, 20) @avatar(comment.commentedUserName, 20)
<a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> closed the issue @datetime(comment.registeredDate) @if(issue.isPullRequest){
<a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> closed the pull request @datetime(comment.registeredDate)
} else {
<a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> closed the issue @datetime(comment.registeredDate)
}
</div> </div>
} }
@if(comment.action == "reopen" || comment.action == "reopen_comment"){ @if(comment.action == "reopen" || comment.action == "reopen_comment"){

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

@@ -18,7 +18,7 @@
<div class="row-fluid"> <div class="row-fluid">
<div class="span10"> <div class="span10">
@issuedetail(issue, comments, collaborators, milestones, hasWritePermission, repository) @issuedetail(issue, comments, collaborators, milestones, hasWritePermission, repository)
@commentlist(comments, hasWritePermission, repository) @commentlist(issue, comments, hasWritePermission, repository)
@commentform(issue, hasWritePermission, repository) @commentform(issue, hasWritePermission, repository)
</div> </div>
<div class="span2"> <div class="span2">

3
src/main/twirl/pulls/discussion.scala.html
View File

@@ -12,8 +12,7 @@
<div class="row-fluid"> <div class="row-fluid">
<div class="span10"> <div class="span10">
@issues.html.issuedetail(issue, comments, collaborators, milestones, hasWritePermission, repository) @issues.html.issuedetail(issue, comments, collaborators, milestones, hasWritePermission, repository)
@issues.html.commentlist(comments, hasWritePermission, repository) @issues.html.commentlist(issue, comments, hasWritePermission, repository, Some(pullreq))
@if(hasWritePermission && !issue.closed){ @if(hasWritePermission && !issue.closed){
<div class="box issue-comment-box" style="background-color: #d8f5cd;"> <div class="box issue-comment-box" style="background-color: #d8f5cd;">
<div class="box-content"class="issue-content" style="border: 1px solid #95c97e; padding: 10px;"> <div class="box-content"class="issue-content" style="border: 1px solid #95c97e; padding: 10px;">