Use of flaglist in search.jet.html

controllers/template_functions.go

@@ -283,11 +283,18 @@ func templateFunctions(vars jet.VarMap) jet.VarMap {
 	vars.Set("genActivityContent", func(a models.Activity, T publicSettings.TemplateTfunc) template.HTML {
 		return a.ToLocale(T)
 	})
-	vars.Set("contains", func(arr []string, comp string) bool {
-		for _, str := range arr {
+	vars.Set("contains", func(arr interface{}, comp string) bool {
+		switch str := arr.(type) {
+		case string:
 			if str == comp {
 				return true
 			}
+		case publicSettings.Language:
+			if str.Code == comp {
+				return true
+			}
+		default:
+			return false
 		}
 		return false
 	})

templates/layouts/partials/helpers/flags.jet.html

@@ -1,8 +1,8 @@
-{{ block flagList(languages=nil, selected="")}}
+{{ block flagList(languages=nil, selected="", inputname="languages")}}
 {{ if isset(languages) }}
     {{ range _, language := languages }}
         <span class="input-group">
-        <input type="checkbox" name="languages" id="lang-{{ language.Code }}" value="{{language.Code}}"{{if contains(selected, language.Code) }} checked{{end}}>
+        <input type="checkbox" name="{{inputname}}" id="lang-{{ language.Code }}" value="{{language.Code}}"{{ range _, v := selected}}{{ if contains(v, language.Code) }} checked{{end}}{{end}}>
         <label for="lang-{{ language.Code }}" class="flag flag-{{ language.Flag(false) }}" title="{{LanguageName(language, T)}}"></label>
         </span>
     {{ end }}

templates/layouts/partials/helpers/search.jet.html

@@ -1,3 +1,4 @@
+{{ import "flags" }}
 {{block search_common()}}
   <select name="c" class="form-input hide-xs form-category">
     <option value="_">{{ T("all_categories")}}</option>
@@ -58,12 +59,7 @@
             {{ T("old")}}.
         </span>
         <div name="language" class="form-refine form-input language">
-        {{ range _, language := GetTorrentLanguages() }}
-            <span class="input-group">
-                <input type="checkbox" name="lang" id="lang{{ language.Code }}" value="{{language.Code}}"{{ range _, v := Search.Languages}}{{ if v.Code == language.Code }} checked{{end}}{{end}}>
-                <label for="lang{{ language.Code }}" class="flag flag-{{ language.Flag(false) }}" title="{{LanguageName(language, T)}}"></label>
-            </span>
-        {{ end }}
+            {{ yield flagList(languages=GetTorrentLanguages(), selected=Search.Languages, inputname="lang")}}
         </div>
         <button type="submit" class="form-input refine-btn" name="refine" value="1">{{  T("refine")}}</button>
     </form>