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

Fix the account page to display repositories which is registered as collaborator.

Browse Source
This commit is contained in:
takezoe
2013-06-06 15:14:28 +09:00
parent 3208792393
commit 1b4db5e6c6
2 changed files with 16 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/scala/service/RepositoryService.scala
View File

@@ -5,6 +5,10 @@ import scala.slick.driver.H2Driver.simple._
import Database.threadLocalSession
import util.JGitUtil
import javax.servlet.ServletContext
import scala.Some
import model.Repository
import model.Account
import model.Collaborator
trait RepositoryService { self: AccountService =>
import RepositoryService._
@@ -46,7 +50,16 @@ trait RepositoryService { self: AccountService =>
* @return the list of repository information which is sorted in descending order of lastActivityDate.
*/
def getRepositoriesOfUser(userName: String, servletContext: ServletContext): List[RepositoryInfo] = {
(Query(Repositories) filter(_.userName is userName.bind) sortBy(_.lastActivityDate desc) list) map { repository =>
val q1 = Repositories
.filter { r => r.userName is userName.bind }
.map { r => r }
val q2 = Collaborators
.innerJoin(Repositories).on((c, r) => (c.userName is r.userName) && (c.repositoryName is r.repositoryName))
.filter{ case (c, r) => c.collaboratorName is userName.bind}
.map { case (c, r) => r }
q1.union(q2).sortBy(_.lastActivityDate).list map { repository =>
val repositoryInfo = JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, servletContext)
RepositoryInfo(repositoryInfo.owner, repositoryInfo.name, repositoryInfo.url, repository, repositoryInfo.branchList, repositoryInfo.tags)
}