diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba2c72e430eee2065efd8fce0f5eece6a535a045..bd2dfd3a99b9993f1740b92777b21ef1f203469f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -76,7 +76,7 @@ deploy-dev: "AltDomainName=dev.ordbok.uib.no" "DomainName=beta.ordbok-dev.aws.uib.no" "ZoneDomainName=ordbok-dev.aws.uib.no" - "PathRewriteLambdaARN=arn:aws:lambda:us-east-1:${AWS_DEV_ACCOUNT}:function:rewrite_request:5" + "PathRewriteLambdaARN=arn:aws:lambda:us-east-1:${AWS_DEV_ACCOUNT}:function:rewrite_request:6" "OrdbokCacheOriginDomain=8mwl23g34a.execute-api.eu-west-1.amazonaws.com" "OrdbokCacheStage=DEV" --no-fail-on-empty-changeset @@ -107,7 +107,7 @@ deploy-prod: - aws cloudformation deploy --stack-name ${STACK_NAME} --template-file "aws/beta.ordbok.uib.no_stack.yaml" --parameter-overrides "CertificateArn=${CERT_ARN}" - "PathRewriteLambdaARN=arn:aws:lambda:us-east-1:${AWS_PROD_ACCOUNT}:function:path_rewrite:13" + "PathRewriteLambdaARN=arn:aws:lambda:us-east-1:${AWS_PROD_ACCOUNT}:function:path_rewrite:14" "OrdbokCacheOriginDomain=n5speug9cl.execute-api.eu-west-1.amazonaws.com" "OrdbokCacheStage=PROD" --no-fail-on-empty-changeset diff --git a/src/components/DictionaryView.vue b/src/components/DictionaryView.vue index 74a087bcc64e6ddda3461c42bca78d2b3306a342..d66da6fa919c7223cfe69353c998a54ca5f2eb1e 100644 --- a/src/components/DictionaryView.vue +++ b/src/components/DictionaryView.vue @@ -241,6 +241,7 @@ export default { monthly_bm: null, monthly_nn: null, event: null, + previous: this.$route.fullPath, } }, computed: { @@ -309,7 +310,7 @@ export default { } }, details_click: function(item) { - item.article.source = this.$route.path + item.article.source = this.previous this.article = item.article history.replaceState({article: this.article, search_results: [], lang: this.lang, error: null}, '') }, @@ -317,6 +318,11 @@ export default { this.article = null } }, + watch: { + $route(to, from) { + this.previous = from.fullPath + } + }, mounted: function(){ let self = this this.lang = 'bm,nn'