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

Update flag columns to BOOLEAN.

Browse Source
This commit is contained in:
takezoe
2013-06-21 13:24:58 +09:00
parent 44e53e05fd
commit 65eb89475a
16 changed files with 58 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,11 +16,11 @@ trait AccountService {
def updateAccount(account: Account): Unit =
Query(Accounts)
.filter { a => a.userName is account.userName.bind }
.map { a => a.password ~ a.mailAddress ~ a.userType ~ a.url.? ~ a.registeredDate ~ a.updatedDate ~ a.lastLoginDate.? }
.map { a => a.password ~ a.mailAddress ~ a.isAdmin ~ a.url.? ~ a.registeredDate ~ a.updatedDate ~ a.lastLoginDate.? }
.update (
account.password,
account.mailAddress,
account.userType,
account.isAdmin,
account.url,
account.registeredDate,
account.updatedDate,
@@ -31,10 +31,3 @@ trait AccountService {
.update(new java.sql.Date(System.currentTimeMillis))
}
object AccountService {
val Normal = 0
val Administrator = 1
}

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

@@ -34,7 +34,7 @@ trait RepositoryService { self: AccountService =>
Repository(
repositoryName = repositoryName,
userName = userName,
repositoryType = Public,
isPrivate = false,
description = description,
defaultBranch = "master",
registeredDate = currentDate,
@@ -112,14 +112,14 @@ trait RepositoryService { self: AccountService =>
def getAccessibleRepositories(account: Option[Account], baseUrl: String): List[RepositoryInfo] = {
account match {
// for Administrators
case Some(x) if(x.userType == AccountService.Administrator) => {
case Some(x) if(x.isAdmin) => {
(Query(Repositories) sortBy(_.lastActivityDate desc) list) map { repository =>
val repositoryInfo = JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl)
RepositoryInfo(repositoryInfo.owner, repositoryInfo.name, repositoryInfo.url, repository, repositoryInfo.branchList, repositoryInfo.tags)
}
}
// for Normal Users
case Some(x) if(x.userType == AccountService.Normal) => {
case Some(x) if(!x.isAdmin) => {
// TODO only repositories registered as collaborator
(Query(Repositories) sortBy(_.lastActivityDate desc) list) map { repository =>
val repositoryInfo = JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl)
@@ -128,7 +128,7 @@ trait RepositoryService { self: AccountService =>
}
// for Guests
case None => {
(Query(Repositories) filter(_.repositoryType is Public.bind) sortBy(_.lastActivityDate desc) list) map { repository =>
(Query(Repositories) filter(_.isPrivate is false.bind) sortBy(_.lastActivityDate desc) list) map { repository =>
val repositoryInfo = JGitUtil.getRepositoryInfo(repository.userName, repository.repositoryName, baseUrl)
RepositoryInfo(repositoryInfo.owner, repositoryInfo.name, repositoryInfo.url, repository, repositoryInfo.branchList, repositoryInfo.tags)
}
@@ -149,11 +149,11 @@ trait RepositoryService { self: AccountService =>
* Save repository options.
*/
def saveRepositoryOptions(userName: String, repositoryName: String,
description: Option[String], defaultBranch: String, repositoryType: Int): Unit =
description: Option[String], defaultBranch: String, isPrivate: Boolean): Unit =
Query(Repositories)
.filter { r => (r.userName is userName.bind) && (r.repositoryName is repositoryName.bind) }
.map { r => r.description.? ~ r.defaultBranch ~ r.repositoryType ~ r.updatedDate }
.update (description, defaultBranch, repositoryType, new java.sql.Date(System.currentTimeMillis))
.map { r => r.description.? ~ r.defaultBranch ~ r.isPrivate ~ r.updatedDate }
.update (description, defaultBranch, isPrivate, new java.sql.Date(System.currentTimeMillis))
/**
* Add collaborator to the repository.
@@ -194,8 +194,6 @@ trait RepositoryService { self: AccountService =>
object RepositoryService {
val Public = 0
val Private = 1
case class RepositoryInfo(owner: String, name: String, url: String, repository: Repository, branchList: List[String], tags: List[util.JGitUtil.TagInfo])
}