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

(refs #254)Change comment action to "delete_branch" from "delete".

Browse Source
This commit is contained in:
takezoe
2014-02-04 17:20:48 +09:00
parent 9d7235af20
commit d882f20436
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,7 +113,7 @@ trait PullRequestsControllerBase extends ControllerBase {
recordDeleteBranchActivity(repository.owner, repository.name, userName, branchName) recordDeleteBranchActivity(repository.owner, repository.name, userName, branchName)
} }
} }
createComment(repository.owner, repository.name, userName, issueId, branchName, "delete") createComment(repository.owner, repository.name, userName, issueId, branchName, "delete_branch")
redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}") redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
} getOrElse NotFound } getOrElse NotFound
}) })

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

@@ -6,7 +6,7 @@
@import context._ @import context._
@import view.helpers._ @import view.helpers._
@comments.map { comment => @comments.map { comment =>
@if(comment.action != "close" && comment.action != "reopen" && comment.action != "delete"){ @if(comment.action != "close" && comment.action != "reopen" && comment.action != "delete_branch"){
<div class="issue-avatar-image">@avatar(comment.commentedUserName, 48)</div> <div class="issue-avatar-image">@avatar(comment.commentedUserName, 48)</div>
<div class="box issue-comment-box" id="comment-@comment.commentId"> <div class="box issue-comment-box" id="comment-@comment.commentId">
<div class="box-header-small"> <div class="box-header-small">
@@ -63,7 +63,7 @@
@user(comment.commentedUserName, styleClass="username strong") reopened the issue @datetime(comment.registeredDate) @user(comment.commentedUserName, styleClass="username strong") reopened the issue @datetime(comment.registeredDate)
</div> </div>
} }
@if(comment.action == "delete"){ @if(comment.action == "delete_branch"){
<div class="small issue-comment-action"> <div class="small issue-comment-action">
<span class="label">Deleted</span> <span class="label">Deleted</span>
@avatar(comment.commentedUserName, 20) @avatar(comment.commentedUserName, 20)