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

Merge branch 'master' of https://github.com/takezoe/gitbucket

Browse Source 
Conflicts:
	src/main/scala/app/SettingsController.scala
This commit is contained in:
takezoe
2013-06-05 01:49:46 +09:00
parent d80823343a f59e852fa1
commit b42d8205a8
25 changed files with 366 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/app/CreateRepositoryController.scala
View File

@@ -18,11 +18,11 @@ class CreateRepositoryController extends CreateRepositoryControllerBase
trait CreateRepositoryControllerBase extends ControllerBase {
self: RepositoryService with WikiService with UsersOnlyAuthenticator =>
case class RepositoryCreationForm(name: String, description: String) // TODO Option?
case class RepositoryCreationForm(name: String, description: Option[String])
val form = mapping(
"name" -> trim(label("Repository name", text(required, maxlength(40), repository))),
"description" -> trim(label("Description" , text()))
"description" -> trim(label("Description" , optional(text())))
)(RepositoryCreationForm.apply)
/**
@@ -39,7 +39,7 @@ trait CreateRepositoryControllerBase extends ControllerBase {
val loginUserName = context.loginAccount.get.userName
// Insert to the database at first
createRepository(form.name, loginUserName, Some(form.description))
createRepository(form.name, loginUserName, form.description)
// Create the actual repository
val gitdir = getRepositoryDir(loginUserName, form.name)