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))
}
}
}

View File

@@ -17,4 +17,18 @@ case class Label(
repositoryName: String,
labelId: Int,
labelName: String,
color: String)
color: String){
val fontColor = {
val r = color.substring(0, 2)
val g = color.substring(2, 4)
val b = color.substring(4, 6)
if(Integer.parseInt(r, 16) + Integer.parseInt(g, 16) + Integer.parseInt(b, 16) > 408){
"000000"
} else {
"FFFFFF"
}
}
}

View File

@@ -64,4 +64,42 @@ trait IssuesService {
currentDate) ).bind
} firstOption
}
object IssuesService {
import java.net.URLEncoder
import javax.servlet.http.HttpServletRequest
case class IssueSearchCondition(labels: Set[String], milestoneId: Option[Int], state: Option[String], sort: Option[String], direction: Option[String]){
import IssueSearchCondition._
def toURL(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context): String = {
val params = List(
if(labels.isEmpty) None else Some("labels=" + urlEncode(labels.mkString(" "))),
milestoneId.map("milestone=" + _),
state.map("state=" + urlEncode(_)),
sort.map("sort=" + urlEncode(_)),
direction.map("direction=" + urlEncode(_))
)
"%s/%s/%s/issues?%s".format(context.path, repository.owner, repository.name, params.flatten.mkString("&"))
}
}
object IssueSearchCondition {
private def urlEncode(value: String): String = URLEncoder.encode(value, "UTF-8")
private def param(request: HttpServletRequest, name: String): Option[String] = {
val value = request.getParameter(name)
if(value == null || value.isEmpty) None else Some(value)
}
def apply(request: HttpServletRequest): IssueSearchCondition =
IssueSearchCondition(
param(request, "labels").map(_.split(" ").toSet).getOrElse(Set.empty),
param(request, "milestone").map(_.toInt),
param(request, "state"),
param(request, "sort"),
param(request, "direction"))
}
}

View File

@@ -1,4 +1,4 @@
@(issues: List[model.Issue], labels: List[model.Label], milestones: List[model.Milestone], repository: service.RepositoryService.RepositoryInfo, isWrite: Boolean)(implicit context: app.Context)
@(issues: List[model.Issue], labels: List[model.Label], milestones: List[model.Milestone], condition: service.IssuesService.IssueSearchCondition, repository: service.RepositoryService.RepositoryInfo, isWrite: Boolean)(implicit context: app.Context)
@import context._
@import view.helpers._
@html.main("Issues - " + repository.owner + "/" + repository.name){
@@ -29,7 +29,11 @@
}
</ul>
<hr/>
No milestone selected
@if(condition.milestoneId.isEmpty){
No milestone selected
} else {
<span class="description">Milestone:</span> @milestones.find(_.milestoneId == condition.milestoneId.get).map(_.title)
}
<div class="btn-group">
<button class="btn dropdown-toggle" data-toggle="dropdown">
<i class="icon-cog"></i>
@@ -37,7 +41,7 @@
</button>
<ul class="dropdown-menu">
@milestones.map { milestone =>
<li><a href="#">@milestone.title</a></li>
<li><a href="@condition.copy(milestoneId = Some(milestone.milestoneId)).toURL(repository)">@milestone.title</a></li>
}
</ul>
</div>
@@ -48,7 +52,8 @@
<ul class="label-list nav nav-pills nav-stacked">
@labels.map { label =>
<li>
<a href="#">
<a href="@condition.copy(labels = (if(condition.labels.contains(label.labelName)) condition.labels - label.labelName else condition.labels + label.labelName)).toURL(repository)"
@if(condition.labels.contains(label.labelName)){style="background-color: #@label.color; color: #@label.fontColor;"}>
<span class="count-right">0</span>
<span style="background-color: #@label.color;" class="label-color">&nbsp;&nbsp;</span>
@label.labelName
@@ -79,8 +84,8 @@
</ul>
</div>
<div class="btn-group">
<a class="btn active" href="#">1 Open</a>
<a class="btn" href="#">1 Closed</a>
<a class="btn@if(condition.state == Some("open")){ active}" href="@condition.copy(state = Some("open")).toURL(repository)">1 Open</a>
<a class="btn@if(condition.state == Some("closed")){ active}" href="@condition.copy(state = Some("closed")).toURL(repository)">1 Closed</a>
</div>
<div class="btn-group">
<button class="btn dropdown-toggle" data-toggle="dropdown">