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

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

Browse Source
This commit is contained in:
takezoe
2013-06-25 14:44:47 +09:00
parent 1ff87ff6b3 deb6f886ee
commit 39dbe0402e
3 changed files with 31 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/scala/app/IssuesController.scala
View File

@@ -15,11 +15,16 @@ trait IssuesControllerBase extends ControllerBase {
with UsersOnlyAuthenticator =>
case class IssueForm(title: String, content: Option[String])
case class CommentForm(issueId: Int, content: String)
val form = mapping(
"title" -> trim(label("Title", text(required))),
"content" -> trim(optional(text()))
)(IssueForm.apply)
val commentForm = mapping(
"issueId" -> label("Issue Id", number()),
"content" -> trim(label("Comment", text(required)))
)(CommentForm.apply)
get("/:owner/:repository/issues"){
val owner = params("owner")
@@ -72,21 +77,12 @@ trait IssuesControllerBase extends ControllerBase {
})
// TODO requires users only and redable repository checking
post("/:owner/:repository/issue_comments")( usersOnly {
post("/:owner/:repository/issue_comments", commentForm)( usersOnly { form =>
val owner = params("owner")
val repository = params("repository")
val issueId = params("issueId").toInt
val content = params("content") // TODO input check
contentType = formats("json")
saveComment(owner, repository, context.loginAccount.get.userName, issueId, content) map {
model => org.json4s.jackson.Serialization.write(
Map("commentedUserName" -> model.commentedUserName,
"registeredDate" -> view.helpers.datetime(model.registeredDate),
"content" -> view.Markdown.toHtml(
model.content, getRepository(owner, repository, baseUrl).get, false, true, true)
))
} getOrElse ""
redirect("/%s/%s/issues/%d#comment-%d".format(owner, repository, form.issueId,
saveComment(owner, repository, context.loginAccount.get.userName, form.issueId, form.content)))
})
}
}