Add search condition behavior to the issues page.

This commit is contained in:
takezoe
2013-06-25 13:54:58 +09:00
parent 34b71c10cb
commit 0547532113
4 changed files with 72 additions and 11 deletions

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
@@ -21,12 +22,15 @@ trait IssuesControllerBase extends ControllerBase {
)(IssueForm.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
@@ -35,7 +39,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))
}
}
}