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

Fix the index page.

Browse Source
This commit is contained in:
takezoe
2013-06-03 01:36:35 +09:00
parent 1ab58d0363
commit b2af70d611
6 changed files with 45 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,6 +6,10 @@ import Database.threadLocalSession
trait AccountService {
def getAccountByUserId(userId: Long): Option[Account] =
Query(Accounts) filter(_.userId is userId.bind) firstOption
def getAccountByUserName(userName: String): Option[Account] =
Query(Accounts) filter(_.userName is userName.bind) firstOption

27
src/main/scala/service/ProjectService.scala
View File

@@ -44,10 +44,10 @@ trait ProjectService { self: AccountService =>
* @param userName the user name
* @return the project list which is sorted in descending order of lastActivityDate.
*/
def getRepositories(userName: String, servletContext: ServletContext): List[RepositoryInfo] = {
def getRepositoriesOfUser(userName: String, servletContext: ServletContext): List[RepositoryInfo] = {
(Query(Projects) filter(_.userId is getUserId(userName).bind) sortBy(_.lastActivityDate desc) list) map { project =>
val repositoryInfo = JGitUtil.getRepositoryInfo(userName, project.projectName, servletContext)
RepositoryInfo(userName, project.projectName, repositoryInfo.url, project, repositoryInfo.branchList, repositoryInfo.tags)
RepositoryInfo(repositoryInfo.owner, repositoryInfo.name, repositoryInfo.url, project, repositoryInfo.branchList, repositoryInfo.tags)
}
}
@@ -56,10 +56,31 @@ trait ProjectService { self: AccountService =>
(project.userId is getUserId(userName).bind) && (project.projectName is projectName.bind)
} firstOption) map { project =>
val repositoryInfo = JGitUtil.getRepositoryInfo(userName, project.projectName, servletContext)
RepositoryInfo(userName, project.projectName, repositoryInfo.url, project, repositoryInfo.branchList, repositoryInfo.tags)
RepositoryInfo(repositoryInfo.owner, repositoryInfo.name, repositoryInfo.url, project, repositoryInfo.branchList, repositoryInfo.tags)
}
}
def getAccessibleRepositories(account: Option[Account], servletContext: ServletContext): List[RepositoryInfo] = {
account match {
case Some(x) => {
(Query(Projects) sortBy(_.lastActivityDate desc) list) map { project =>
// TODO ユーザ名はジョインして取得する？
val repositoryInfo = JGitUtil.getRepositoryInfo(getUserName(project.userId), project.projectName, servletContext)
RepositoryInfo(repositoryInfo.owner, repositoryInfo.name, repositoryInfo.url, project, repositoryInfo.branchList, repositoryInfo.tags)
}
}
case None => {
(Query(Projects) filter(_.projectType is 0.bind) sortBy(_.lastActivityDate desc) list) map { project =>
// TODO ユーザ名はジョインして取得する？
val repositoryInfo = JGitUtil.getRepositoryInfo(getUserName(project.userId), project.projectName, servletContext)
RepositoryInfo(repositoryInfo.owner, repositoryInfo.name, repositoryInfo.url, project, repositoryInfo.branchList, repositoryInfo.tags)
}
}
}
}
private def getUserName(userId: Long): String = getAccountByUserId(userId).get.userName
private def getUserId(userName: String): Long = getAccountByUserName(userName).get.userId.get
}