mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 16:40:24 +08:00 
			
		
		
		
	fix: trim the whitespaces for the search keyword (#893)
This commit is contained in:
		@@ -5,7 +5,7 @@
 | 
			
		||||
package repo
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"path"
 | 
			
		||||
	"strings"
 | 
			
		||||
 | 
			
		||||
	api "code.gitea.io/sdk/gitea"
 | 
			
		||||
 | 
			
		||||
@@ -21,7 +21,7 @@ import (
 | 
			
		||||
// see https://github.com/gogits/go-gogs-client/wiki/Repositories#search-repositories
 | 
			
		||||
func Search(ctx *context.APIContext) {
 | 
			
		||||
	opts := &models.SearchRepoOptions{
 | 
			
		||||
		Keyword:  path.Base(ctx.Query("q")),
 | 
			
		||||
		Keyword:  strings.Trim(ctx.Query("q"), " "),
 | 
			
		||||
		OwnerID:  ctx.QueryInt64("uid"),
 | 
			
		||||
		PageSize: convert.ToCorrectPageSize(ctx.QueryInt("limit")),
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
@@ -5,6 +5,8 @@
 | 
			
		||||
package user
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"strings"
 | 
			
		||||
 | 
			
		||||
	"github.com/Unknwon/com"
 | 
			
		||||
 | 
			
		||||
	api "code.gitea.io/sdk/gitea"
 | 
			
		||||
@@ -16,7 +18,7 @@ import (
 | 
			
		||||
// Search search users
 | 
			
		||||
func Search(ctx *context.APIContext) {
 | 
			
		||||
	opts := &models.SearchUserOptions{
 | 
			
		||||
		Keyword:  ctx.Query("q"),
 | 
			
		||||
		Keyword:  strings.Trim(ctx.Query("q"), " "),
 | 
			
		||||
		Type:     models.UserTypeIndividual,
 | 
			
		||||
		PageSize: com.StrTo(ctx.Query("limit")).MustInt(),
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
@@ -5,12 +5,12 @@
 | 
			
		||||
package routers
 | 
			
		||||
 | 
			
		||||
import (
 | 
			
		||||
	"bytes"
 | 
			
		||||
	"fmt"
 | 
			
		||||
	"strings"
 | 
			
		||||
 | 
			
		||||
	"github.com/Unknwon/paginater"
 | 
			
		||||
 | 
			
		||||
	"bytes"
 | 
			
		||||
 | 
			
		||||
	"code.gitea.io/gitea/models"
 | 
			
		||||
	"code.gitea.io/gitea/modules/base"
 | 
			
		||||
	"code.gitea.io/gitea/modules/context"
 | 
			
		||||
@@ -100,7 +100,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
 | 
			
		||||
		orderBy = "created_unix DESC"
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	keyword := ctx.Query("q")
 | 
			
		||||
	keyword := strings.Trim(ctx.Query("q"), " ")
 | 
			
		||||
	if len(keyword) == 0 {
 | 
			
		||||
		repos, err = opts.Ranger(&models.SearchRepoOptions{
 | 
			
		||||
			Page:     page,
 | 
			
		||||
@@ -199,7 +199,7 @@ func RenderUserSearch(ctx *context.Context, opts *UserSearchOptions) {
 | 
			
		||||
		orderBy = "id DESC"
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	keyword := ctx.Query("q")
 | 
			
		||||
	keyword := strings.Trim(ctx.Query("q"), " ")
 | 
			
		||||
	if len(keyword) == 0 {
 | 
			
		||||
		users, err = opts.Ranger(&models.SearchUserOptions{OrderBy: orderBy,
 | 
			
		||||
			Page:     page,
 | 
			
		||||
 
 | 
			
		||||
@@ -7,6 +7,7 @@ package repo
 | 
			
		||||
import (
 | 
			
		||||
	"container/list"
 | 
			
		||||
	"path"
 | 
			
		||||
	"strings"
 | 
			
		||||
 | 
			
		||||
	"code.gitea.io/git"
 | 
			
		||||
	"code.gitea.io/gitea/models"
 | 
			
		||||
@@ -106,7 +107,7 @@ func Graph(ctx *context.Context) {
 | 
			
		||||
func SearchCommits(ctx *context.Context) {
 | 
			
		||||
	ctx.Data["PageIsCommits"] = true
 | 
			
		||||
 | 
			
		||||
	keyword := ctx.Query("q")
 | 
			
		||||
	keyword := strings.Trim(ctx.Query("q"), " ")
 | 
			
		||||
	if len(keyword) == 0 {
 | 
			
		||||
		ctx.Redirect(ctx.Repo.RepoLink + "/commits/" + ctx.Repo.BranchName)
 | 
			
		||||
		return
 | 
			
		||||
 
 | 
			
		||||
@@ -145,7 +145,7 @@ func Issues(ctx *context.Context) {
 | 
			
		||||
	milestoneID := ctx.QueryInt64("milestone")
 | 
			
		||||
	isShowClosed := ctx.Query("state") == "closed"
 | 
			
		||||
 | 
			
		||||
	keyword := ctx.Query("q")
 | 
			
		||||
	keyword := strings.Trim(ctx.Query("q"), " ")
 | 
			
		||||
	if bytes.Contains([]byte(keyword), []byte{0x00}) {
 | 
			
		||||
		keyword = ""
 | 
			
		||||
	}
 | 
			
		||||
 
 | 
			
		||||
@@ -40,7 +40,7 @@ func GetNotificationCount(c *context.Context) {
 | 
			
		||||
// Notifications is the notifications page
 | 
			
		||||
func Notifications(c *context.Context) {
 | 
			
		||||
	var (
 | 
			
		||||
		keyword = c.Query("q")
 | 
			
		||||
		keyword = strings.Trim(c.Query("q"), " ")
 | 
			
		||||
		status  models.NotificationStatus
 | 
			
		||||
		page    = c.QueryInt("page")
 | 
			
		||||
		perPage = c.QueryInt("perPage")
 | 
			
		||||
 
 | 
			
		||||
@@ -155,7 +155,7 @@ func Profile(ctx *context.Context) {
 | 
			
		||||
			ctx.Data["SortType"] = "recentupdate"
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		keyword := ctx.Query("q")
 | 
			
		||||
		keyword := strings.Trim(ctx.Query("q"), " ")
 | 
			
		||||
		ctx.Data["Keyword"] = keyword
 | 
			
		||||
		if len(keyword) == 0 {
 | 
			
		||||
			var total int
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user