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

Add link to clear issue filter.

Browse Source
This commit is contained in:
takezoe
2013-06-25 16:13:29 +09:00
parent aae5bfd184
commit 0bbdb77d05
3 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,24 +29,22 @@ trait IssuesControllerBase extends ControllerBase {
get("/:owner/:repository/issues"){
val owner = params("owner")
val repository = params("repository")
val condition = IssueSearchCondition(request)
val sessionKey = "%s/%s/issues".format(owner, repository)
println(condition)
// retreive search condition
val condition = if(request.getQueryString == null){
session.get(sessionKey).getOrElse(IssueSearchCondition()).asInstanceOf[IssueSearchCondition]
} else IssueSearchCondition(request)
getRepository(owner, repository, baseUrl) match {
case None => NotFound()
case Some(repositoryInfo) => {
// search condition
val closed = params.get("state") collect {
case "closed" => true
} getOrElse false
session.put(sessionKey, condition)
issues.html.issues(searchIssue(owner, repository, closed),
getLabels(owner, repository),
getMilestones(owner, repository).filter(_.closedDate.isEmpty),
condition, repositoryInfo, isWritable(owner, repository, context.loginAccount))
}
}
getRepository(owner, repository, baseUrl).map { repositoryInfo =>
issues.html.issues(searchIssue(owner, repository, condition.state == "closed"),
getLabels(owner, repository),
getMilestones(owner, repository).filter(_.closedDate.isEmpty),
condition, repositoryInfo, isWritable(owner, repository, context.loginAccount))
} getOrElse NotFound
}
get("/:owner/:repository/issues/:id"){

8
src/main/scala/service/IssuesService.scala
View File

@@ -75,7 +75,13 @@ object IssuesService {
import java.net.URLEncoder
import javax.servlet.http.HttpServletRequest
case class IssueSearchCondition(labels: Set[String], milestoneId: Option[Int], state: String, sort: String, direction: String){
case class IssueSearchCondition(
labels: Set[String] = Set.empty,
milestoneId: Option[Int] = None,
state: String = "open",
sort: String = "created",
direction: String = "desc"){
import IssueSearchCondition._
def toURL(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context): String = {