Skip to content
Snippets Groups Projects
Commit 0f54d483 authored by Henrik Askjer's avatar Henrik Askjer
Browse files

Merge branch 'hotfix-invalid-articles' into 'prod'

Hotfix invalid articles

See merge request spraksamlingane/beta.ordbok.uib.no!113
parents 2e32d282 28f1c6d6
No related branches found
No related tags found
No related merge requests found
<template>
<article class='v-sheet v-card rounded-xl' v-bind:class="{'collapsable': collapsable, 'collapsed': collapsed}" v-if="article">
<div v-if="!invalid">
<Header :title_id="title_id" :lemmas="article.lemmas" :dictionary="dictionary" :article_id="article.article_id" @toggle-collapse = "toggle_collapse"/>
<InflectionButton :lemmas="article.lemmas" :dictionary="dictionary" :article_id="article.article_id"/>
......@@ -30,6 +31,8 @@
</section>
</div>
<ArticleFooter v-if="!collapsed" :article="article"/>
</div>
<div v-else><v-icon left>warning</v-icon> {{$t('error.article', {no: article.article_id, dict: $t('dicts_inline.'+this.dictionary)})}}</div>
</article>
</template>
......@@ -81,7 +84,8 @@ export default {
},
data: function() {
return {
is_collapsed: true
is_collapsed: true,
invalid: false
}
},
metaInfo() {
......@@ -153,6 +157,7 @@ export default {
}
} catch(error) {
console.error("link_to_self",this.article.article_id, this.dictionary, error.message)
this.invalid = true
//console.error(error)
return {ref: "", article: this.article}
}
......@@ -233,6 +238,7 @@ export default {
})
} catch(error) {
console.error("parse_definitions",this.article.article_id, this.dictionary, error.message)
this.invalid = true
//console.error(error)
definitionTexts = []
}
......
......@@ -204,6 +204,7 @@ export default {
}
} catch(error) {
console.error("lemma_groups",this.article_id, this.dictionary, error.message)
this.$parent.invalid = true
//console.error(error)
}
return groups
......
......@@ -134,6 +134,7 @@
}
},
"error": {
"article": "An error has occured in article {no} in {dict}",
"404": {
"title": "404: Not Found",
"description": "The page may have been deleted or moved, or you may have used an invalid link."
......
......@@ -134,6 +134,7 @@
}
},
"error": {
"article": "Det har oppstått ein feil i artikkel {no} i {dict}",
"404": {
"title": "404: Ikkje funne",
"description": "Sida kan ha blitt sletta eller flytta, eller du kan ha brukt ei ugyldig lenkje."
......
......@@ -146,6 +146,7 @@
}
},
"error": {
"article": "Det har oppstått en feil i artikkel {no} i {dict}",
"404": {
"title": "404: Ikke funnet",
"description": "Siden kan ha blitt slettet eller flyttet, eller du kan ha brukt en ugyldig lenke."
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment