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

Fix repository description handling.

Browse Source
This commit is contained in:
takezoe
2013-06-04 16:57:52 +09:00
parent 5eedc87c3a
commit af26afec25
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
src/main/twirl/index.scala.html
View File

@@ -9,7 +9,9 @@
/ /
<a href="@path/@repository.owner/@repository.name">@repository.name</a> <a href="@path/@repository.owner/@repository.name">@repository.name</a>
</div> </div>
<div>@repository.repository.description</div> @if(repository.repository.description.isDefined){
<div>@repository.repository.description</div>
}
<div><span class="description small">Last updated: @repository.repository.lastActivityDate</span></div> <div><span class="description small">Last updated: @repository.repository.lastActivityDate</span></div>
</div> </div>
} }

4
src/main/twirl/user.scala.html
View File

@@ -26,7 +26,9 @@
@repositories.map { repository => @repositories.map { repository =>
<div class="block"> <div class="block">
<div class="block-header-2"><a href="@path/@repository.owner/@repository.name">@repository.name</a></div> <div class="block-header-2"><a href="@path/@repository.owner/@repository.name">@repository.name</a></div>
<div>@repository.repository.description</div> @if(repository.repository.description.isDefined){
<div>@repository.repository.description</div>
}
<div><span class="description small">Last updated: @repository.repository.lastActivityDate</span></div> <div><span class="description small">Last updated: @repository.repository.lastActivityDate</span></div>
</div> </div>
} }