foster/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-21 08:31:27 -05:00
Code Issues Wiki Activity

ui(code-search): fix to use CodeSearchMode

Browse source 
Drop unused IsFuzzy and IsRegExp
This commit is contained in:
Radosław Piliszek 2024-08-27 17:11:48 +02:00
parent 7068456d20
commit d2efdda911
5 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
routers/web/explore/code.go
View file

@ -45,7 +45,6 @@ func Code(ctx *context.Context) {
ctx.Data["Keyword"] = keyword ctx.Data["Keyword"] = keyword
ctx.Data["Language"] = language ctx.Data["Language"] = language
ctx.Data["CodeSearchOptions"] = []string{"exact", "fuzzy"} ctx.Data["CodeSearchOptions"] = []string{"exact", "fuzzy"}
ctx.Data["IsFuzzy"] = isFuzzy
if isFuzzy { if isFuzzy {
ctx.Data["CodeSearchMode"] = "fuzzy" ctx.Data["CodeSearchMode"] = "fuzzy"
} else { } else {

2
routers/web/repo/search.go
View file

@ -63,8 +63,6 @@ func Search(ctx *context.Context) {
ctx.Data["Keyword"] = keyword ctx.Data["Keyword"] = keyword
ctx.Data["Language"] = language ctx.Data["Language"] = language
ctx.Data["IsFuzzy"] = mode == FuzzySearchMode
ctx.Data["IsRegExp"] = mode == RegExpSearchMode
ctx.Data["CodeSearchMode"] = mode.String() ctx.Data["CodeSearchMode"] = mode.String()
ctx.Data["PageIsViewCode"] = true ctx.Data["PageIsViewCode"] = true

1
routers/web/user/code.go
View file

@ -50,7 +50,6 @@ func CodeSearch(ctx *context.Context) {
ctx.Data["Keyword"] = keyword ctx.Data["Keyword"] = keyword
ctx.Data["Language"] = language ctx.Data["Language"] = language
ctx.Data["CodeSearchOptions"] = []string{"exact", "fuzzy"} ctx.Data["CodeSearchOptions"] = []string{"exact", "fuzzy"}
ctx.Data["IsFuzzy"] = isFuzzy
if isFuzzy { if isFuzzy {
ctx.Data["CodeSearchMode"] = "fuzzy" ctx.Data["CodeSearchMode"] = "fuzzy"
} else { } else {

2
templates/repo/search.tmpl
View file

@ -5,7 +5,7 @@
{{if $.CodeIndexerDisabled}} {{if $.CodeIndexerDisabled}}
{{$branchURLPrefix := printf "%s/search/branch/" $.RepoLink}} {{$branchURLPrefix := printf "%s/search/branch/" $.RepoLink}}
{{$tagURLPrefix := printf "%s/search/tag/" $.RepoLink}} {{$tagURLPrefix := printf "%s/search/tag/" $.RepoLink}}
{{$suffix := printf "?q=%s&fuzzy=%t" (.Keyword|QueryEscape) .IsFuzzy}} {{$suffix := printf "?q=%s&mode=%s" (.Keyword|QueryEscape) .CodeSearchMode}}
{{template "repo/branch_dropdown" dict "root" . "ContainerClasses" "tw-mb-3" "branchURLPrefix" $branchURLPrefix "branchURLSuffix" $suffix "tagURLPrefix" $tagURLPrefix "tagURLSuffix" $suffix}} {{template "repo/branch_dropdown" dict "root" . "ContainerClasses" "tw-mb-3" "branchURLPrefix" $branchURLPrefix "branchURLSuffix" $suffix "tagURLPrefix" $tagURLPrefix "tagURLSuffix" $suffix}}
{{end}} {{end}}
{{template "shared/search/code/search" .}} {{template "shared/search/code/search" .}}

2
templates/shared/search/code/results.tmpl
View file

@ -1,7 +1,7 @@
<div class="flex-text-block tw-flex-wrap"> <div class="flex-text-block tw-flex-wrap">
{{range $term := .SearchResultLanguages}} {{range $term := .SearchResultLanguages}}
<a class="ui {{if eq $.Language $term.Language}}primary{{end}} basic label tw-m-0" <a class="ui {{if eq $.Language $term.Language}}primary{{end}} basic label tw-m-0"
href="?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}&fuzzy={{$.IsFuzzy}}"> href="?q={{$.Keyword}}{{if ne $.Language $term.Language}}&l={{$term.Language}}{{end}}&mode={{$.CodeSearchMode}}">
<i class="color-icon tw-mr-2" style="background-color: {{$term.Color}}"></i> <i class="color-icon tw-mr-2" style="background-color: {{$term.Color}}"></i>
{{$term.Language}} {{$term.Language}}
<div class="detail">{{$term.Count}}</div> <div class="detail">{{$term.Count}}</div>