Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Search branches #27055

Merged
merged 8 commits into from
Sep 17, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions models/git/branch_list.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ type FindBranchOptions struct {
ExcludeBranchNames []string
IsDeletedBranch util.OptionalBool
OrderBy string
Keyword string
}

func (opts *FindBranchOptions) Cond() builder.Cond {
Expand All @@ -84,6 +85,9 @@ func (opts *FindBranchOptions) Cond() builder.Cond {
if !opts.IsDeletedBranch.IsNone() {
cond = cond.And(builder.Eq{"is_deleted": opts.IsDeletedBranch.IsTrue()})
}
if opts.Keyword != "" {
cond = cond.And(builder.Like{"name", opts.Keyword})
lunny marked this conversation as resolved.
Show resolved Hide resolved
}
return cond
}

Expand Down
1 change: 1 addition & 0 deletions options/locale/locale_en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2513,6 +2513,7 @@ branch.default_deletion_failed = Branch "%s" is the default branch. It cannot be
branch.restore = Restore Branch "%s"
branch.download = Download Branch "%s"
branch.rename = Rename Branch "%s"
branch.search = Search Branch
branch.included_desc = This branch is part of the default branch
branch.included = Included
branch.create_new_branch = Create branch from branch:
Expand Down
5 changes: 4 additions & 1 deletion routers/web/repo/branch.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ func Branches(ctx *context.Context) {
}
pageSize := setting.Git.BranchesRangeSize

defaultBranch, branches, branchesCount, err := repo_service.LoadBranches(ctx, ctx.Repo.Repository, ctx.Repo.GitRepo, util.OptionalBoolNone, page, pageSize)
kw := ctx.FormString("q")

defaultBranch, branches, branchesCount, err := repo_service.LoadBranches(ctx, ctx.Repo.Repository, ctx.Repo.GitRepo, util.OptionalBoolNone, kw, page, pageSize)
if err != nil {
ctx.ServerError("LoadBranches", err)
return
Expand All @@ -73,6 +75,7 @@ func Branches(ctx *context.Context) {
commitStatus[commitID] = git_model.CalcCommitStatus(cs)
}

ctx.Data["Keyword"] = kw
ctx.Data["Branches"] = branches
ctx.Data["CommitStatus"] = commitStatus
ctx.Data["CommitStatuses"] = commitStatuses
Expand Down
3 changes: 2 additions & 1 deletion services/repository/branch.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ type Branch struct {
}

// LoadBranches loads branches from the repository limited by page & pageSize.
func LoadBranches(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Repository, isDeletedBranch util.OptionalBool, page, pageSize int) (*Branch, []*Branch, int64, error) {
func LoadBranches(ctx context.Context, repo *repo_model.Repository, gitRepo *git.Repository, isDeletedBranch util.OptionalBool, keyword string, page, pageSize int) (*Branch, []*Branch, int64, error) {
defaultDBBranch, err := git_model.GetBranch(ctx, repo.ID, repo.DefaultBranch)
if err != nil {
return nil, nil, 0, err
Expand All @@ -79,6 +79,7 @@ func LoadBranches(ctx context.Context, repo *repo_model.Repository, gitRepo *git
Page: page,
PageSize: pageSize,
},
Keyword: keyword,
}

totalNumOfBranches, err := git_model.CountBranches(ctx, branchOpts)
Expand Down
15 changes: 13 additions & 2 deletions templates/repo/branch/list.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,20 @@
{{end}}

{{if .Branches}}
<h4 class="ui top attached header">
{{.locale.Tr "repo.branches"}}
<h4 class="ui top attached header gt-df gt-ac gt-sb">
<div class="gt-df gt-ac">
{{.locale.Tr "repo.branches"}}
</div>
<div class="gt-whitespace-nowrap">
<form class="ignore-dirty" method="get">
<div class="ui tiny search input">
<input name="q" placeholder="{{.locale.Tr "repo.branch.search"}}" value="{{.Keyword}}" autofocus>
</div>
<button class="ui primary tiny button gt-mr-0" data-panel="#add-deploy-key-panel" data-tooltip-content={{.locale.Tr "repo.commits.search.tooltip"}}>{{.locale.Tr "repo.commits.find"}}</button>
lunny marked this conversation as resolved.
Show resolved Hide resolved
</form>
</div>
</h4>

<div class="ui attached table segment">
<table class="ui very basic striped fixed table single line">
<tbody>
Expand Down
Loading