diff options
| -rw-r--r-- | routers/web/explore/code.go | 4 | ||||
| -rw-r--r-- | routers/web/user/code.go | 4 | ||||
| -rw-r--r-- | templates/shared/search/combo_multi.tmpl | 26 |
3 files changed, 15 insertions, 19 deletions
diff --git a/routers/web/explore/code.go b/routers/web/explore/code.go index 7a3f6a5a86..437282cbb1 100644 --- a/routers/web/explore/code.go +++ b/routers/web/explore/code.go @@ -35,11 +35,9 @@ func Code(ctx *context.Context) { language := ctx.FormTrim("l") keyword := ctx.FormTrim("q") - isFuzzy := true + isFuzzy := ctx.FormOptionalBool("fuzzy").ValueOrDefault(true) if mode := ctx.FormTrim("mode"); len(mode) > 0 { isFuzzy = mode == "fuzzy" - } else { - isFuzzy = ctx.FormOptionalBool("fuzzy").ValueOrDefault(true) } ctx.Data["Keyword"] = keyword diff --git a/routers/web/user/code.go b/routers/web/user/code.go index bf4cbb8920..26e48d1ea6 100644 --- a/routers/web/user/code.go +++ b/routers/web/user/code.go @@ -40,11 +40,9 @@ func CodeSearch(ctx *context.Context) { language := ctx.FormTrim("l") keyword := ctx.FormTrim("q") - isFuzzy := true + isFuzzy := ctx.FormOptionalBool("fuzzy").ValueOrDefault(true) if mode := ctx.FormTrim("mode"); len(mode) > 0 { isFuzzy = mode == "fuzzy" - } else { - isFuzzy = ctx.FormOptionalBool("fuzzy").ValueOrDefault(true) } ctx.Data["Keyword"] = keyword diff --git a/templates/shared/search/combo_multi.tmpl b/templates/shared/search/combo_multi.tmpl index 23c4b4d406..89dc20b530 100644 --- a/templates/shared/search/combo_multi.tmpl +++ b/templates/shared/search/combo_multi.tmpl @@ -7,18 +7,18 @@ <div class="ui small fluid action input"> {{template "shared/search/input" dict "Value" .Value "Disabled" .Disabled "Placeholder" .Placeholder}} <div class="ui small dropdown selection {{if .Disabled}} disabled{{end}}" data-tooltip-content="{{ctx.Locale.Tr "search.type_tooltip"}}"> - <div class="text"> - {{ctx.Locale.Tr (printf "search.%s" .Selected)}} - </div> - <div class="menu" data-test-tag="fuzzy-dropdown"> - {{range $opt := .Options}} - {{$isActive := eq $.Selected $opt}} - <label class="{{if $isActive}}active {{end}}item" data-value="{{$opt}}" data-tooltip-content="{{ctx.Locale.Tr (printf "search.%s_tooltip" $opt)}}"> - <input hidden type="radio" name="mode" value="{{$opt}}"{{if $isActive}} checked{{end}}/> - {{ctx.Locale.Tr (printf "search.%s" $opt)}} - </label> - {{end}} - </div> - </div> + <div class="text"> + {{ctx.Locale.Tr (printf "search.%s" .Selected)}} + </div> + <div class="menu" data-test-tag="fuzzy-dropdown"> + {{range $opt := .Options}} + {{$isActive := eq $.Selected $opt}} + <label class="{{if $isActive}}active {{end}}item" data-value="{{$opt}}" data-tooltip-content="{{ctx.Locale.Tr (printf "search.%s_tooltip" $opt)}}"> + <input hidden type="radio" name="mode" value="{{$opt}}"{{if $isActive}} checked{{end}}/> + {{ctx.Locale.Tr (printf "search.%s" $opt)}} + </label> + {{end}} + </div> + </div> {{template "shared/search/button" dict "Disabled" .Disabled "Tooltip" .Tooltip}} </div> |