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

IssueSearchCondition.state is changed to String from Option[String]

Browse Source 
because it has a default value 'open'.
This commit is contained in:
takezoe
2013-06-25 15:13:15 +09:00
parent 4f13c84b63
commit ffa6d21d28
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,14 +75,14 @@ object IssuesService {
import java.net.URLEncoder import java.net.URLEncoder
import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletRequest
case class IssueSearchCondition(labels: Set[String], milestoneId: Option[Int], state: Option[String], sort: Option[String], direction: Option[String]){ case class IssueSearchCondition(labels: Set[String], milestoneId: Option[Int], state: String, sort: Option[String], direction: Option[String]){
import IssueSearchCondition._ import IssueSearchCondition._
def toURL(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context): String = { def toURL(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context): String = {
val params = List( val params = List(
if(labels.isEmpty) None else Some("labels=" + urlEncode(labels.mkString(" "))), if(labels.isEmpty) None else Some("labels=" + urlEncode(labels.mkString(" "))),
milestoneId.map("milestone=" + _), milestoneId.map("milestone=" + _),
state.map("state=" + urlEncode(_)), Some("state=" + urlEncode(state)),
sort.map("sort=" + urlEncode(_)), sort.map("sort=" + urlEncode(_)),
direction.map("direction=" + urlEncode(_)) direction.map("direction=" + urlEncode(_))
) )
@@ -103,7 +103,7 @@ object IssuesService {
IssueSearchCondition( IssueSearchCondition(
param(request, "labels").map(_.split(" ").toSet).getOrElse(Set.empty), param(request, "labels").map(_.split(" ").toSet).getOrElse(Set.empty),
param(request, "milestone").map(_.toInt), param(request, "milestone").map(_.toInt),
param(request, "state"), param(request, "state").getOrElse("open"),
param(request, "sort"), param(request, "sort"),
param(request, "direction")) param(request, "direction"))
} }