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

Save repository options.

Browse Source
This commit is contained in:
takezoe
2013-06-04 18:23:51 +09:00
parent 118e32662d
commit 79a0ba5630
3 changed files with 48 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/scala/app/SettingsController.scala
View File

@@ -5,12 +5,19 @@ import jp.sf.amateras.scalatra.forms._
class SettingsController extends SettingsControllerBase with RepositoryService with AccountService
trait SettingsControllerBase extends ControllerBase { self: RepositoryService with AccountService =>
case class OptionsForm(description: Option[String], defaultBranch: String, repositoryType: Int)
val optionsForm = mapping(
"description" -> trim(label("Description" , optional(text()))),
"defaultBranch" -> trim(label("Default Branch" , text(required, maxlength(100)))),
"repositoryType" -> trim(label("Repository Type", number()))
)(OptionsForm.apply)
case class CollaboratorForm(userName: String)
val form = mapping(
val collaboratorForm = mapping(
"userName" -> trim(label("Username", text(required, collaborator)))
)(CollaboratorForm.apply)
@@ -27,6 +34,16 @@ trait SettingsControllerBase extends ControllerBase { self: RepositoryService wi
settings.html.options(getRepository(owner, repository, servletContext).get)
})
post("/:owner/:repository/settings/options", optionsForm){ form =>
val owner = params("owner")
val repository = params("repository")
// save repository options
saveRepositoryOptions(owner, repository, form.description, form.defaultBranch, form.repositoryType)
redirect("%s/%s/settings/options".format(owner, repository))
}
get("/:owner/:repository/settings/collaborators")(ownerOnly {
val owner = params("owner")
val repository = params("repository")
@@ -34,7 +51,7 @@ trait SettingsControllerBase extends ControllerBase { self: RepositoryService wi
settings.html.collaborators(getCollaborators(owner, repository), getRepository(owner, repository, servletContext).get)
})
post("/:owner/:repository/settings/collaborators/_add", form)(ownerOnly { form =>
post("/:owner/:repository/settings/collaborators/_add", collaboratorForm)(ownerOnly { form =>
val owner = params("owner")
val repository = params("repository")
addCollaborator(owner, repository, form.userName)

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

@@ -106,13 +106,21 @@ trait RepositoryService { self: AccountService =>
/**
* Updates the last activity date of the repository.
*/
def updateLastActivityDate(userName: String, repositoryName: String): Unit = {
val q = for {
r <- Repositories if (r.userName is userName.bind) && (r.repositoryName is repositoryName.bind)
} yield r.lastActivityDate
q.update(new java.sql.Date(System.currentTimeMillis))
}
def updateLastActivityDate(userName: String, repositoryName: String): Unit =
Query(Repositories)
.filter { r => (r.userName is userName.bind) && (r.repositoryName is repositoryName.bind) }
.map { _.lastActivityDate }
.update (new java.sql.Date(System.currentTimeMillis))
/**
* Save repository options.
*/
def saveRepositoryOptions(userName: String, repositoryName: String,
description: Option[String], defaultBranch: String, repositoryType: Int): 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))
/**
* Add collaborator to the repository.