Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-01-05 23:30:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2016 from kazuki43zoo/create-comment-on-change-title

Browse Source 
Create comment on changing issue title
This commit is contained in:
Naoki Takezoe
2018-05-23 02:18:28 +09:00
committed by GitHub
parent 9812f66b0d 5ac8b87a76
commit 31d546fd5a
3 changed files with 54 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
doc/comment_action.md
View File

@@ -6,22 +6,26 @@ The details are saved at `ISSUE_COMMENT` table.
To determine if it was any operation, you see the `ACTION` column.
And in the case of some actions, `CONTENT` column value contains additional information.
|ACTION |CONTENT |
|----------------|----------------------|
|comment |comment |
|close_comment |comment |
|reopen_comment |comment |
|close |"Close" |
|reopen |"Reopen" |
|commit |comment commitId |
|merge |comment |
|delete_branch |branchName |
|refer |issueId:title |
|add_label |labelName |
|delete_label |labelName |
|change_priority |oldPriority:priority |
|change_milestone|oldMilestone:milestone|
|assign |oldAssigned:assigned |
|ACTION |CONTENT |
|----------------|--------------------------|
|comment |comment |
|close_comment |comment |
|reopen_comment |comment |
|close |"Close" |
|reopen |"Reopen" |
|commit |comment commitId |
|merge |comment |
|delete_branch |branchName |
|refer |issueId:title |
|add_label |labelName |
|delete_label |labelName |
|change_priority |oldPriority:priority |
|change_milestone|oldMilestone:milestone |
|assign |oldAssigned:assigned |
|change_title |oldTitle(CRLF)title \[1\] |
\[1\]: (CRLF) is "\r\n"
### comment
@@ -79,3 +83,7 @@ This value is saved when users have changed the milestone.
### assign
This value is saved when users have assign issue/PR to user or remove the assign.
### change_title
This value is saved when users have changed the title.

28
src/main/scala/gitbucket/core/controller/IssuesController.scala
View File

@@ -154,15 +154,25 @@ trait IssuesControllerBase extends ControllerBase {
ajaxPost("/:owner/:repository/issues/edit_title/:id", issueTitleEditForm)(readableUsersOnly { (title, repository) =>
defining(repository.owner, repository.name) {
case (owner, name) =>
getIssue(owner, name, params("id")).map { issue =>
if (isEditableContent(owner, name, issue.openedUserName)) {
// update issue
updateIssue(owner, name, issue.issueId, title, issue.content)
// extract references and create refer comment
createReferComment(owner, name, issue.copy(title = title), title, context.loginAccount.get)
redirect(s"/${owner}/${name}/issues/_data/${issue.issueId}")
} else Unauthorized()
getIssue(owner, name, params("id")).map {
issue =>
if (isEditableContent(owner, name, issue.openedUserName)) {
if (issue.title != title) {
// update issue
updateIssue(owner, name, issue.issueId, title, issue.content)
// extract references and create refer comment
createReferComment(owner, name, issue.copy(title = title), title, context.loginAccount.get)
createComment(
owner,
name,
context.loginAccount.get.userName,
issue.issueId,
issue.title + "\r\n" + title,
"change_title"
)
}
redirect(s"/${owner}/${name}/issues/_data/${issue.issueId}")
} else Unauthorized()
} getOrElse NotFound()
}
})

11
src/main/twirl/gitbucket/core/issues/commentlist.scala.html
View File

@@ -228,6 +228,17 @@
</div>
</div>
}
case "change_title" => {
<div class="discussion-item discussion-item-pencil">
<div class="discussion-item-header">
<span class="discussion-item-icon"><i class="octicon octicon-pencil"></i></span>
@helpers.avatar(comment.commentedUserName, 16)
@helpers.user(comment.commentedUserName, styleClass="username strong")
change title from <code>@comment.content.split("\r\n")(0)</code> to <code>@comment.content.split("\r\n")(1)</code>
@gitbucket.core.helper.html.datetimeago(comment.registeredDate)
</div>
</div>
}
case _ => {
@showFormattedComment(comment)
}