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

(refs #2)'Pull Requests' tab in dashboard has been completed.

Browse Source
This commit is contained in:
takezoe
2013-08-07 03:31:26 +09:00
parent 908931b9ed
commit 1ebf4276e7
5 changed files with 53 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/scala/service/PullRequestService.scala
View File

@@ -18,7 +18,7 @@ trait PullRequestService { self: IssuesService =>
} else None
}
def getPullRequestCount(closed: Boolean, owner: String, repository: Option[String]): List[PullRequestCount] =
def getPullRequestCountGroupByUser(closed: Boolean, owner: String, repository: Option[String]): List[PullRequestCount] =
Query(PullRequests)
.innerJoin(Issues).on { (t1, t2) => t1.byPrimaryKey(t2.userName, t2.repositoryName, t2.issueId) }
.filter { case (t1, t2) =>
@@ -28,9 +28,9 @@ trait PullRequestService { self: IssuesService =>
}
.groupBy { case (t1, t2) => t2.openedUserName }
.map { case (userName, t) => userName ~ t.length }
.sortBy(_._2 desc)
.list
.map { x => PullRequestCount(x._1, x._2) }
.sortBy(_.count).reverse
def createPullRequest(originUserName: String, originRepositoryName: String, issueId: Int,
originBranch: String, requestUserName: String, requestRepositoryName: String, requestBranch: String,