Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-07-05 06:48:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Keyword search for issues and pull requests using search box (#3429)

Browse Source
This commit is contained in:
Naoki Takezoe
2023-11-22 01:55:01 +09:00
committed by GitHub
parent fc4819cb29
commit 4ca3816522
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/scala/gitbucket/core/controller/IssuesController.scala
View File

@@ -93,7 +93,13 @@ trait IssuesControllerBase extends ControllerBase {
case Some(filter) if filter.contains("is:pr") =>
redirect(s"/${repository.owner}/${repository.name}/pulls?q=${StringUtil.urlEncode(q)}")
case Some(filter) =>
searchIssues(repository, IssueSearchCondition(filter), IssueSearchCondition.page(request))
val condition = IssueSearchCondition(filter)
if (condition.isEmpty) {
// Redirect to keyword search
redirect(s"/${repository.owner}/${repository.name}/search?q=${StringUtil.urlEncode(q)}&type=issues")
} else {
searchIssues(repository, condition, IssueSearchCondition.page(request))
}
case None =>
searchIssues(repository, IssueSearchCondition(request), IssueSearchCondition.page(request))
}

8
src/main/scala/gitbucket/core/controller/PullRequestsController.scala
View File

@@ -106,7 +106,13 @@ trait PullRequestsControllerBase extends ControllerBase {
case Some(filter) if filter.contains("is:issue") =>
redirect(s"/${repository.owner}/${repository.name}/issues?q=${StringUtil.urlEncode(q)}")
case Some(filter) =>
searchPullRequests(repository, IssueSearchCondition(filter), IssueSearchCondition.page(request))
val condition = IssueSearchCondition(filter)
if (condition.isEmpty) {
// Redirect to keyword search
redirect(s"/${repository.owner}/${repository.name}/search?q=${StringUtil.urlEncode(q)}&type=pulls")
} else {
searchPullRequests(repository, IssueSearchCondition(filter), IssueSearchCondition.page(request))
}
case None =>
searchPullRequests(repository, IssueSearchCondition(request), IssueSearchCondition.page(request))
}

7
src/main/scala/gitbucket/core/service/IssuesService.scala
View File

@@ -975,15 +975,15 @@ object IssuesService {
groups: Set[String] = Set.empty,
others: Seq[CustomFieldCondition] = Nil
) {
def isEmpty: Boolean = {
labels.isEmpty && milestone.isEmpty && author.isEmpty && assigned.isEmpty &&
state == "open" && sort == "created" && direction == "desc" && visibility.isEmpty
state == "open" && sort == "created" && direction == "desc" && visibility.isEmpty && others.isEmpty
}
def nonEmpty: Boolean = !isEmpty
def toFilterString: String =
def toFilterString: String = if (isEmpty) ""
else {
(
List(
Some(s"is:${state}"),
@@ -1025,6 +1025,7 @@ object IssuesService {
} ++
groups.map(group => s"group:${group}")
).mkString(" ")
}
def toURL: String = {
"?" + (Seq(