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

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

Browse Source
This commit is contained in:
shimamoto
2013-06-25 14:11:39 +09:00
parent 317e2b6ea3 cfef0b80d5
commit deb6f886ee
4 changed files with 74 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,6 +3,7 @@ package app
import jp.sf.amateras.scalatra.forms._
import service._
import IssuesService._
import util.UsersOnlyAuthenticator
class IssuesController extends IssuesControllerBase
@@ -26,12 +27,15 @@ trait IssuesControllerBase extends ControllerBase {
)(CommentForm.apply)
get("/:owner/:repository/issues"){
val owner = params("owner")
val owner = params("owner")
val repository = params("repository")
val condition = IssueSearchCondition(request)
println(condition)
getRepository(owner, repository, baseUrl) match {
case None => NotFound()
case Some(r) => {
case None => NotFound()
case Some(repositoryInfo) => {
// search condition
val closed = params.get("state") collect {
case "closed" => true
@@ -40,7 +44,7 @@ trait IssuesControllerBase extends ControllerBase {
issues.html.issues(searchIssue(owner, repository, closed),
getLabels(owner, repository),
getMilestones(owner, repository).filter(_.closedDate.isEmpty),
r, isWritable(owner, repository, context.loginAccount))
condition, repositoryInfo, isWritable(owner, repository, context.loginAccount))
}
}
}
@@ -81,4 +85,4 @@ trait IssuesControllerBase extends ControllerBase {
saveComment(owner, repository, context.loginAccount.get.userName, form.issueId, form.content)))
})
}
}