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

Add the cancellation process of the issue.

Browse Source
This commit is contained in:
shimamoto
2013-06-27 17:11:49 +09:00
parent 2de816d197
commit 6d763e8097
3 changed files with 52 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,7 +53,9 @@ trait IssuesControllerBase extends ControllerBase {
// TODO requires users only and readable repository checking
get("/:owner/:repository/issues/new")( usersOnly {
issues.html.issueedit(getRepository(params("owner"), params("repository"), baseUrl).get)
getRepository(params("owner"), params("repository"), baseUrl)
.map (issues.html.issueedit(_))
.getOrElse (NotFound)
})
// TODO requires users only and readable repository checking
@@ -74,13 +76,7 @@ trait IssuesControllerBase extends ControllerBase {
val content = params.get("content")
updateIssue(owner, repository, issueId, title, content)
contentType = formats("json")
org.json4s.jackson.Serialization.write(
Map("title" -> title,
"content" -> view.Markdown.toHtml(content getOrElse "No description given.",
getRepository(owner, repository, baseUrl).get, false, true, true)))
redirect("/%s/%s/issues/_data/%d".format(owner, repository, issueId))
}
// TODO requires users only and readable repository checking
@@ -98,23 +94,39 @@ trait IssuesControllerBase extends ControllerBase {
val content = params("content")
updateComment(commentId, content)
contentType = formats("json")
org.json4s.jackson.Serialization.write(
Map("content" -> view.Markdown.toHtml(content,
getRepository(params("owner"), params("repository"), baseUrl).get, false, true, true)))
redirect("/%s/%s/issue_comments/_data/%d".format(params("owner"), params("repository"), commentId))
}
// TODO Authenticator
get("/:owner/:repository/issues/_data/:id"){
getIssue(params("owner"), params("repository"), params("id")) map { x =>
issues.html.edit(Some(x.title), x.content.getOrElse(""), x.issueId, x.userName, x.repositoryName)
params.get("dataType") collect {
case t if t == "html" => issues.html.edit(
Some(x.title), x.content getOrElse "", x.issueId, x.userName, x.repositoryName)
} getOrElse {
contentType = formats("json")
org.json4s.jackson.Serialization.write(
Map("title" -> x.title,
"content" -> view.Markdown.toHtml(x.content getOrElse "No description given.",
getRepository(x.userName, x.repositoryName, baseUrl).get, false, true, true)
))
}
} getOrElse NotFound
}
// TODO Authenticator
get("/:owner/:repository/issue_comments/_data/:id"){
getComment(params("id")) map { x =>
issues.html.edit(None, x.content, x.commentId, x.userName, x.repositoryName)
params.get("dataType") collect {
case t if t == "html" => issues.html.edit(
None, x.content, x.commentId, x.userName, x.repositoryName)
} getOrElse {
contentType = formats("json")
org.json4s.jackson.Serialization.write(
Map("content" -> view.Markdown.toHtml(x.content,
getRepository(x.userName, x.repositoryName, baseUrl).get, false, true, true)
))
}
} getOrElse NotFound
}