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

(refs #2)Fix compile errors.

Browse Source
This commit is contained in:
takezoe
2013-07-24 13:33:07 +09:00
parent f10f98abf2
commit 205119cc01
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/app/PullRequestsController.scala
View File

@@ -88,7 +88,7 @@ trait PullRequestsControllerBase extends ControllerBase {
try { try {
// TODO mark issue as 'merged' // TODO mark issue as 'merged'
val loginAccount = context.loginAccount.get val loginAccount = context.loginAccount.get
createComment(repository.owner, repository.name, loginAccount.userName, issueId, "Closed", Some("close")) createComment(repository.owner, repository.name, loginAccount.userName, issueId, "Closed", "close")
updateClosed(repository.owner, repository.name, issueId, true) updateClosed(repository.owner, repository.name, issueId, true)
recordMergeActivity(repository.owner, repository.name, loginAccount.userName, issueId, form.message) recordMergeActivity(repository.owner, repository.name, loginAccount.userName, issueId, form.message)

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

@@ -79,17 +79,20 @@
@markdown(comment.content, repository, false, true) @markdown(comment.content, repository, false, true)
</div> </div>
</div> </div>
@comment.action.map { action =>
<div class="small issue-comment-action"> <div class="small issue-comment-action">
@if(action == "close"){ @if(comment.action == "close" || comment.action == "close_comment"){
<div class="small issue-comment-action">
<span class="label label-important">Closed</span> <span class="label label-important">Closed</span>
<a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> closed the issue @datetime(comment.registeredDate) <a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> closed the issue @datetime(comment.registeredDate)
} else { </div>
}
@if(comment.action == "reopen" || comment.action == "reopen_comment"){
<div class="small issue-comment-action">
<span class="label label-success">Reopened</span> <span class="label label-success">Reopened</span>
<a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> reopened the issue @datetime(comment.registeredDate) <a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> reopened the issue @datetime(comment.registeredDate)
</div>
} }
</div> </div>
}
} }
@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;">