From be38fa9521461fff155eb22a2b051fa9d7c86c97 Mon Sep 17 00:00:00 2001
From: Henrik Askjer <henrik.askjer@uib.no>
Date: Tue, 16 Nov 2021 14:15:11 +0100
Subject: [PATCH] fix error when switching dictionaries
---
src/components/DictionaryView.vue | 7 +++++--
src/components/SearchResults.vue | 12 ++++++++----
2 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/src/components/DictionaryView.vue b/src/components/DictionaryView.vue
index f6564055..4dfa6c6c 100644
--- a/src/components/DictionaryView.vue
+++ b/src/components/DictionaryView.vue
@@ -222,8 +222,11 @@ function navigate_to_query(self, word) {
api.get('articles?', {params: {w: query.match || query.q, dict: self.lang, scope: "w"}}).then((response) => {
self.article_info = response.data
self.search_results = {}
- Promise.all([load_articles(self, query, 0, 10, "bm"),
- load_articles(self, query, 0, 10, "nn")])
+ let article_queries = []
+ if (self.lang == "bm" || self.lang == "bm,nn") article_queries.push(load_articles(self, query, 0, 10, "bm"))
+ if (self.lang == "nn" || self.lang == "bm,nn") article_queries.push(load_articles(self, query, 0, 10, "nn"))
+ console.log(article_queries)
+ Promise.all(article_queries)
.then(() => {
self.waiting_for_articles = false
history.replaceState({
diff --git a/src/components/SearchResults.vue b/src/components/SearchResults.vue
index 2ff91f85..f1346309 100644
--- a/src/components/SearchResults.vue
+++ b/src/components/SearchResults.vue
@@ -1,7 +1,7 @@
<template>
<section id="search_results">
<div class="flex-container" :class="$vuetify.breakpoint.name">
- <ul class="hits" :v-if="results_bm">
+ <ul class="hits" v-if="count_bm">
<li class="results-count">Treff i Bokmålsordboka: {{count_bm}}</li>
<li v-if="!this.$vuetify.breakpoint.mdAndUp" class="results-count">Treff i Nynorskorboka: {{count_nn}}</li>
<li class="article_container" v-for="(result, index) in results_bm" :key="index + bm_hash" tabindex="-1">
@@ -12,7 +12,7 @@
</Article>
</li>
</ul>
- <ul class="hits" :v-if="results_nn">
+ <ul class="hits" v-if="count_nn">
<li v-if="this.$vuetify.breakpoint.mdAndUp" class="results-count">Treff i Nynorskorboka: {{count_nn}}</li>
<li class="article_container" v-for="(result, index) in results_nn" :key="index + nn_hash" tabindex="-1">
<Article
@@ -53,10 +53,14 @@ export default {
return this.results_nn.reduce((hash, hit) => (hash + hit.article_id) % 10000, 0)
},
count_bm: function(){
- return this.meta["bm"]["total"]
+ if (this.meta.bm ){
+ return this.meta.bm.total
+ }
},
count_nn: function(){
- return this.meta["nn"]["total"]
+ if (this.meta.nn) {
+ return this.meta.nn.total
+ }
}
},
methods: {
--
GitLab