- fancier select dropdown for language

- parse accept-language from header in findall - wip
daptin · Feb 2, 2020 · ef14d89 · ef14d89
1 parent 32dd4a7
commit ef14d89
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/daptinweb/src/components/Dash.vue b/daptinweb/src/components/Dash.vue
@@ -38,13 +38,12 @@
           <div class="col-sm-3 col-md-3">
             <form class="navbar-form">
               <div class="input-group">
-                <select @change="setPreferredLanguage" v-model="preferredLanguageLocal" style="font-size: 16px; color: white; background-color: #0000005e" class="form-control"
+                <el-select filterable @change="setPreferredLanguage" v-model="preferredLanguageLocal"
+                           style="font-size: 16px; color: white; background-color: #0000005e"
                         placeholder="Search" name="q">
-                  <option v-for="language in languages" :value="language.id"
-                          :selected="preferredLanguage === language.id">
-                    {{language.label}}
-                  </option>
-                </select>
+                  <el-option v-for="language in languages" :key="language.id" :label="language.label" :value="language.id"
+                          :selected="preferredLanguage === language.id"></el-option>
+                </el-select>
               </div>
             </form>
           </div>

diff --git a/server/resource/resource_findallpaginated.go b/server/resource/resource_findallpaginated.go
@@ -23,7 +23,8 @@ func (dr *DbResource) GetTotalCount() uint64 {
 	}
 
 	var count uint64
-	dr.db.QueryRowx(s, v...).Scan(&count)
+	err = dr.db.QueryRowx(s, v...).Scan(&count)
+	CheckErr(err, "Failed to execute total count query [%s] [%v]", s, v)
 	//log.Infof("Count: [%v] %v", dr.model.GetTableName(), count)
 	return count
 }
@@ -90,7 +91,7 @@ func (dr *DbResource) PaginatedFindAllWithoutFilters(req api2go.Request) ([]map[
 		}
 	}
 
-	// todo: change this hardcode default to en languge and move to config store as part of maybe @resource.TableInfo
+	// todo: change this hardcode default en language and move to config store as part of maybe @resource.TableInfo
 	languagePreferences := GetLanguagePreference(req.Header.Get("Accept-Language"), "en")
 
 	if languagePreferences != nil {
@@ -603,8 +604,6 @@ func GetLanguagePreference(header string, defaultLanguage string) []string {
 	return pref
 }
 
-
-
 func addFilters(queryBuilder squirrel.SelectBuilder, queries []Query, prefix string) squirrel.SelectBuilder {
 
 	if len(queries) == 0 {