diff --git a/src/main/scala/gitbucket/core/controller/DashboardController.scala b/src/main/scala/gitbucket/core/controller/DashboardController.scala index f2a0f11..0f4648e 100644 --- a/src/main/scala/gitbucket/core/controller/DashboardController.scala +++ b/src/main/scala/gitbucket/core/controller/DashboardController.scala @@ -83,9 +83,9 @@ } else session.getAs[IssueSearchCondition](key).getOrElse(IssueSearchCondition())) filter match { - case "assigned" => condition.copy(assigned = Some(userName), author = None , mentioned = None) - case "mentioned" => condition.copy(assigned = None , author = None , mentioned = Some(userName)) - case _ => condition.copy(assigned = None , author = Some(userName), mentioned = None) + case "assigned" => condition.copy(assigned = Some(Some(userName)), author = None, mentioned = None) + case "mentioned" => condition.copy(assigned = None, author = None, mentioned = Some(userName)) + case _ => condition.copy(assigned = None, author = Some(userName), mentioned = None) } } @@ -103,7 +103,7 @@ countIssue(condition.copy(state = "open" ), false, userRepos: _*), countIssue(condition.copy(state = "closed"), false, userRepos: _*), filter match { - case "assigned" => condition.copy(assigned = Some(userName)) + case "assigned" => condition.copy(assigned = Some(Some(userName))) case "mentioned" => condition.copy(mentioned = Some(userName)) case _ => condition.copy(author = Some(userName)) }, @@ -128,7 +128,7 @@ countIssue(condition.copy(state = "open" ), true, allRepos: _*), countIssue(condition.copy(state = "closed"), true, allRepos: _*), filter match { - case "assigned" => condition.copy(assigned = Some(userName)) + case "assigned" => condition.copy(assigned = Some(Some(userName))) case "mentioned" => condition.copy(mentioned = Some(userName)) case _ => condition.copy(author = Some(userName)) }, diff --git a/src/main/scala/gitbucket/core/service/IssuesService.scala b/src/main/scala/gitbucket/core/service/IssuesService.scala index 529492d..f3f4b96 100644 --- a/src/main/scala/gitbucket/core/service/IssuesService.scala +++ b/src/main/scala/gitbucket/core/service/IssuesService.scala @@ -234,9 +234,8 @@ .map { case (owner, repository) => t1.byRepository(owner, repository) } .foldLeft[Column[Boolean]](false) ( _ || _ ) && (t1.closed === (condition.state == "closed").bind) && - //(t1.milestoneId === condition.milestoneId.get.get.bind, condition.milestoneId.flatten.isDefined) && - (t1.milestoneId.? isEmpty, condition.milestone == Some(None)) && - (t1.assignedUserName === condition.assigned.get.bind, condition.assigned.isDefined) && + (t1.milestoneId.? isEmpty, condition.milestone == Some(None)) && + (t1.assignedUserName.? isEmpty, condition.assigned == Some(None)) && (t1.openedUserName === condition.author.get.bind, condition.author.isDefined) && (t1.pullRequest === pullRequest.bind) && // Milestone filter @@ -244,6 +243,8 @@ (t2.byPrimaryKey(t1.userName, t1.repositoryName, t1.milestoneId)) && (t2.title === condition.milestone.get.get.bind) } exists, condition.milestone.flatten.isDefined) && + // Assignee filter + (t1.assignedUserName === condition.assigned.get.get.bind, condition.assigned.flatten.isDefined) && // Label filter (IssueLabels filter { t2 => (t2.byIssue(t1.userName, t1.repositoryName, t1.issueId)) && @@ -447,7 +448,7 @@ labels: Set[String] = Set.empty, milestone: Option[Option[String]] = None, author: Option[String] = None, - assigned: Option[String] = None, + assigned: Option[Option[String]] = None, mentioned: Option[String] = None, state: String = "open", sort: String = "created", @@ -491,12 +492,15 @@ def toURL: String = "?" + List( if(labels.isEmpty) None else Some("labels=" + urlEncode(labels.mkString(","))), - milestone.map { _ match { + milestone.map { case Some(x) => "milestone=" + urlEncode(x) case None => "milestone=none" - }}, + }, author .map(x => "author=" + urlEncode(x)), - assigned .map(x => "assigned=" + urlEncode(x)), + assigned.map { + case Some(x) => "assigned=" + urlEncode(x) + case None => "assigned=none" + }, mentioned.map(x => "mentioned=" + urlEncode(x)), Some("state=" + urlEncode(state)), Some("sort=" + urlEncode(sort)), @@ -541,10 +545,14 @@ conditions.get("milestone").flatMap(_.headOption) match { case None => None case Some("none") => Some(None) - case Some(x) => Some(Some(x)) //milestones.get(x).map(x => Some(x)) + case Some(x) => Some(Some(x)) }, conditions.get("author").flatMap(_.headOption), - conditions.get("assignee").flatMap(_.headOption), + conditions.get("assignee").flatMap(_.headOption) match { + case None => None + case Some("none") => Some(None) + case Some(x) => Some(Some(x)) + }, conditions.get("mentions").flatMap(_.headOption), conditions.get("is").getOrElse(Seq.empty).find(x => x == "open" || x == "closed").getOrElse("open"), sort, @@ -565,7 +573,10 @@ case x => Some(x) }, param(request, "author"), - param(request, "assigned"), + param(request, "assigned").map { + case "none" => None + case x => Some(x) + }, param(request, "mentioned"), param(request, "state", Seq("open", "closed")).getOrElse("open"), param(request, "sort", Seq("created", "comments", "updated")).getOrElse("created"), diff --git a/src/main/twirl/gitbucket/core/issues/listparts.scala.html b/src/main/twirl/gitbucket/core/issues/listparts.scala.html index 3177c23..219026e 100644 --- a/src/main/twirl/gitbucket/core/issues/listparts.scala.html +++ b/src/main/twirl/gitbucket/core/issues/listparts.scala.html @@ -51,23 +51,28 @@ } @helper.html.dropdown("Milestone") {
  • - + @helper.html.checkicon(condition.milestone == Some(None)) Issues with no milestone
    • @milestones.filter(_.closedDate.isEmpty).map { milestone =>
  • - + @helper.html.checkicon(condition.milestone == Some(Some(milestone.title))) @milestone.title
    • } } @helper.html.dropdown("Assignee") { +
  • + + @helper.html.checkicon(condition.assigned == Some(None)) Assigned to nobody + +
    • @collaborators.map { collaborator =>
  • - - @helper.html.checkicon(condition.assigned == Some(collaborator)) + + @helper.html.checkicon(condition.assigned == Some(Some(collaborator))) @avatar(collaborator, 20) @collaborator