use "fuzzy" instead of "t" in query

Author: 6543

routers/web/explore/code.go

@@ -34,12 +34,11 @@ func Code(ctx *context.Context) {
 	language := ctx.FormTrim("l")
 	keyword := ctx.FormTrim("q")
 
-	queryType := ctx.FormTrim("t")
-	isFuzzy := queryType != "match"
+	isFuzzy := ctx.FormBool("fuzzy")
 
 	ctx.Data["Keyword"] = keyword
 	ctx.Data["Language"] = language
-	ctx.Data["queryType"] = queryType
+	ctx.Data["IsFuzzy"] = isFuzzy
 	ctx.Data["PageIsViewCode"] = true
 
 	if keyword == "" {

routers/web/repo/search.go

@@ -24,12 +24,11 @@ func Search(ctx *context.Context) {
 	language := ctx.FormTrim("l")
 	keyword := ctx.FormTrim("q")
 
-	queryType := ctx.FormTrim("t")
-	isFuzzy := queryType != "match"
+	isFuzzy := ctx.FormBool("fuzzy")
 
 	ctx.Data["Keyword"] = keyword
 	ctx.Data["Language"] = language
-	ctx.Data["queryType"] = queryType
+	ctx.Data["IsFuzzy"] = isFuzzy
 	ctx.Data["PageIsViewCode"] = true
 
 	if keyword == "" {

routers/web/user/code.go

@@ -39,12 +39,11 @@ func CodeSearch(ctx *context.Context) {
 	language := ctx.FormTrim("l")
 	keyword := ctx.FormTrim("q")
 
-	queryType := ctx.FormTrim("t")
-	isFuzzy := queryType != "match"
+	isFuzzy := ctx.FormBool("fuzzy")
 
 	ctx.Data["Keyword"] = keyword
 	ctx.Data["Language"] = language
-	ctx.Data["queryType"] = queryType
+	ctx.Data["IsFuzzy"] = isFuzzy
 	ctx.Data["IsCodePage"] = true
 
 	if keyword == "" {

templates/code/searchform.tmpl

@@ -1,7 +1,7 @@
 <form class="ui form ignore-dirty">
 	<div class="ui fluid action input">
 		{{template "shared/searchinput" dict "Value" .Keyword "Disabled" .CodeIndexerUnavailable}}
-		{{template "shared/searchfuzzy" dict "Disabled" .CodeIndexerUnavailable "QueryType" .queryType "Topic" "explore"}}
+		{{template "shared/searchfuzzy" dict "Disabled" .CodeIndexerUnavailable "IsFuzzy" .IsFuzzy "Topic" "explore"}}
 		<button class="ui primary button"{{if .CodeIndexerUnavailable}} disabled{{end}}>{{ctx.Locale.Tr "explore.search"}}</button>
 	</div>
 </form>

templates/repo/search.tmpl

@@ -6,7 +6,7 @@
 			<form class="ui form ignore-dirty" method="get">
 				<div class="ui fluid action input">
 					<input name="q" value="{{.Keyword}}"{{if .CodeIndexerUnavailable}} disabled{{end}} placeholder="{{ctx.Locale.Tr "repo.search.search_repo"}}">
-					{{template "shared/searchfuzzy" dict "Disabled" .CodeIndexerUnavailable "QueryType" .queryType "Topic" "repo"}}
+					{{template "shared/searchfuzzy" dict "Disabled" .CodeIndexerUnavailable "IsFuzzy" .IsFuzzy "Topic" "repo"}}
 					<button class="ui icon button"{{if .CodeIndexerUnavailable}} disabled{{end}} type="submit">{{svg "octicon-search" 16}}</button>
 				</div>
 			</form>

templates/shared/searchfuzzy.tmpl

@@ -1,9 +1,13 @@
 <!-- Topic can be "repo" or "explore" -->
 <div class="ui dropdown selection {{if .Disabled}} disabled{{end}}" data-tooltip-content="{{ctx.Locale.Tr (printf "%s.search.type.tooltip" .Topic)}}">
-	<input name="t" type="hidden"{{if .Disabled}} disabled{{end}} value="{{.QueryType}}">{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-	<div class="text">{{ctx.Locale.Tr (printf "%s.search.%s" .Topic (or .QueryType "fuzzy"))}}</div>
+	<input name="fuzzy" type="hidden"{{if .Disabled}} disabled{{end}} value="{{.IsFuzzy}}">{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+	{{if .IsFuzzy}}
+		<div class="text">{{ctx.Locale.Tr (printf "%s.search.fuzzy" .Topic)}}</div>
+	{{else}}
+		<div class="text">{{ctx.Locale.Tr (printf "%s.search.match" .Topic)}}</div>
+	{{end}}
 	<div class="menu">
-		<div class="item" data-value="fuzzy" data-tooltip-content="{{ctx.Locale.Tr (printf "%s.search.fuzzy.tooltip" .Topic)}}">{{ctx.Locale.Tr (printf "%s.search.fuzzy" .Topic)}}</div>
-		<div class="item" data-value="match" data-tooltip-content="{{ctx.Locale.Tr (printf "%s.search.match.tooltip" .Topic)}}">{{ctx.Locale.Tr (printf "%s.search.match" .Topic)}}</div>
+		<div class="item" data-value="true" data-tooltip-content="{{ctx.Locale.Tr (printf "%s.search.fuzzy.tooltip" .Topic)}}">{{ctx.Locale.Tr (printf "%s.search.fuzzy" .Topic)}}</div>
+		<div class="item" data-value="false" data-tooltip-content="{{ctx.Locale.Tr (printf "%s.search.match.tooltip" .Topic)}}">{{ctx.Locale.Tr (printf "%s.search.match" .Topic)}}</div>
 	</div>
 </div>