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

Fix wrong overwriting of updatedDate of Issues and Pull requests (#3053)

Browse Source
This commit is contained in:
Naoki Takezoe
2022-05-02 22:11:46 +09:00
committed by GitHub
parent 504e651828
commit e401d30159
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -258,7 +258,7 @@ trait IssuesControllerBase extends ControllerBase {
loginAccount =>
getComment(repository.owner, repository.name, params("id")).map { comment =>
if (isEditableContent(repository.owner, repository.name, comment.commentedUserName, loginAccount)) {
updateComment(comment.issueId, comment.commentId, form.content)
updateComment(repository.owner, repository.name, comment.issueId, comment.commentId, form.content)
redirect(s"/${repository.owner}/${repository.name}/issue_comments/_data/${comment.commentId}")
} else Unauthorized()
} getOrElse NotFound()

2
src/main/scala/gitbucket/core/service/HandleCommentService.scala
View File

@@ -165,7 +165,7 @@ trait HandleCommentService {
content match {
case Some(content) =>
// Update comment
val _commentId = Some(updateComment(issue.issueId, commentId.toInt, content))
val _commentId = Some(updateComment(owner, name, issue.issueId, commentId.toInt, content))
// Record comment activity
val commentInfo = if (issue.isPullRequest) {
PullRequestCommentInfo(owner, name, userName, content, issue.issueId)

10
src/main/scala/gitbucket/core/service/IssuesService.scala
View File

@@ -509,7 +509,7 @@ trait IssuesService {
content: String,
action: String
)(implicit s: Session): Int = {
Issues.filter(_.issueId === issueId.bind).map(_.updatedDate).update(currentDate)
Issues.filter(_.byPrimaryKey(owner, repository, issueId)).map(_.updatedDate).update(currentDate)
IssueComments returning IssueComments.map(_.commentId) insert IssueComment(
userName = owner,
repositoryName = repository,
@@ -635,8 +635,10 @@ trait IssuesService {
.update(priorityId, currentDate)
}
def updateComment(issueId: Int, commentId: Int, content: String)(implicit s: Session): Int = {
Issues.filter(_.issueId === issueId.bind).map(_.updatedDate).update(currentDate)
def updateComment(owner: String, repository: String, issueId: Int, commentId: Int, content: String)(
implicit s: Session
): Int = {
Issues.filter(_.byPrimaryKey(owner, repository, issueId)).map(_.updatedDate).update(currentDate)
IssueComments.filter(_.byPrimaryKey(commentId)).map(t => (t.content, t.updatedDate)).update(content, currentDate)
}
@@ -644,7 +646,7 @@ trait IssuesService {
implicit context: Context,
s: Session
): Int = {
Issues.filter(_.issueId === issueId.bind).map(_.updatedDate).update(currentDate)
Issues.filter(_.byPrimaryKey(owner, repository, issueId)).map(_.updatedDate).update(currentDate)
IssueComments.filter(_.byPrimaryKey(commentId)).firstOption match {
case Some(c) if c.action == "reopen_comment" =>
IssueComments.filter(_.byPrimaryKey(commentId)).map(t => (t.content, t.action)).update("Reopen", "reopen")