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

(refs #2)Record 'open pull request' activity.

Browse Source
This commit is contained in:
takezoe
2013-07-14 03:27:59 +09:00
parent 62f2defd91
commit 3a7e2c0249
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,12 +13,12 @@ import scala.Some
import util.JGitUtil.CommitInfo import util.JGitUtil.CommitInfo
class PullRequestsController extends PullRequestsControllerBase class PullRequestsController extends PullRequestsControllerBase
with RepositoryService with AccountService with IssuesService with PullRequestService with MilestonesService with RepositoryService with AccountService with IssuesService with PullRequestService with MilestonesService with ActivityService
with ReferrerAuthenticator with CollaboratorsAuthenticator with ReferrerAuthenticator with CollaboratorsAuthenticator
trait PullRequestsControllerBase extends ControllerBase { trait PullRequestsControllerBase extends ControllerBase {
self: ReferrerAuthenticator with RepositoryService with IssuesService with MilestonesService self: RepositoryService with IssuesService with MilestonesService with ActivityService with PullRequestService
with PullRequestService with CollaboratorsAuthenticator => with ReferrerAuthenticator with CollaboratorsAuthenticator =>
val form = mapping( val form = mapping(
"title" -> trim(label("Title" , text(required, maxlength(100)))), "title" -> trim(label("Title" , text(required, maxlength(100)))),
@@ -130,6 +130,8 @@ trait PullRequestsControllerBase extends ControllerBase {
repository.name, repository.name,
form.requestCommitId) form.requestCommitId)
recordPullRequestActivity(repository.owner, repository.name, loginUserName, issueId, form.title)
redirect(s"/${repository.owner}/${repository.name}/pulls/${issueId}") redirect(s"/${repository.owner}/${repository.name}/pulls/${issueId}")
}) })

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

@@ -110,6 +110,13 @@ trait ActivityService {
None, None,
currentDate) currentDate)
def recordPullRequestActivity(userName: String, repositoryName: String, activityUserName: String, issueId: Int, title: String): Unit =
Activities.autoInc insert(userName, repositoryName, activityUserName,
"open_pullreq",
s"[user:${activityUserName}] opened pull request [pullreq:${userName}/${repositoryName}#${issueId}]",
Some(title),
currentDate)
def insertCommitId(userName: String, repositoryName: String, commitId: String) = { def insertCommitId(userName: String, repositoryName: String, commitId: String) = {
CommitLog insert (userName, repositoryName, commitId) CommitLog insert (userName, repositoryName, commitId)
} }