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

(refs #2)Fix comment to pull request activity.

Browse Source
This commit is contained in:
takezoe
2013-08-07 04:13:14 +09:00
parent 1ebf4276e7
commit a0a284ad26
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/scala/app/IssuesController.scala
View File

@@ -282,7 +282,8 @@ trait IssuesControllerBase extends ControllerBase {
val (action, recordActivity) =
getAction(issue)
.collect {
case "close" => true -> (Some("close") -> Some(recordCloseIssueActivity _))
case "close" if(issue.isPullRequest) => true -> (Some("close") -> Some(recordClosePullRequestActivity _))
case "close" if(!issue.isPullRequest) => true -> (Some("close") -> Some(recordCloseIssueActivity _))
case "reopen" => false -> (Some("reopen") -> Some(recordReopenIssueActivity _))
}
.map { case (closed, t) =>
@@ -299,7 +300,12 @@ trait IssuesControllerBase extends ControllerBase {
}
// record activity
content foreach ( recordCommentIssueActivity(owner, name, userName, issueId, _) )
content foreach { content =>
if(issue.isPullRequest)
recordCommentPullRequestActivity(owner, name, userName, issueId, content)
else
recordCommentIssueActivity(owner, name, userName, issueId, content)
}
recordActivity foreach ( _ (owner, name, userName, issueId, issue.title) )
(issue, commentId)

14
src/main/scala/service/ActivityService.scala
View File

@@ -52,6 +52,13 @@ trait ActivityService {
Some(title),
currentDate)
def recordClosePullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String): Unit =
Activities.autoInc insert(userName, repositoryName, activityUserName,
"close_issue",
s"[user:${activityUserName}] closed pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
Some(title),
currentDate)
def recordReopenIssueActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String): Unit =
Activities.autoInc insert(userName, repositoryName, activityUserName,
"reopen_issue",
@@ -66,6 +73,13 @@ trait ActivityService {
Some(cut(comment, 200)),
currentDate)
def recordCommentPullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, comment: String): Unit =
Activities.autoInc insert(userName, repositoryName, activityUserName,
"comment_issue",
s"[user:${activityUserName}] commented on pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
Some(cut(comment, 200)),
currentDate)
def recordCreateWikiPageActivity(userName: String, repositoryName: String, activityUserName: String, pageName: String) =
Activities.autoInc insert(userName, repositoryName, activityUserName,
"create_wiki",