Mercurial > gemma
changeset 2796:718ec88fbeed
import_overview: disable loading spinner in case of errors
| author | Thomas Junk <thomas.junk@intevation.de> |
|---|---|
| date | Mon, 25 Mar 2019 13:44:55 +0100 |
| parents | 241e7f05a538 |
| children | 3c83d1cc0348 |
| files | client/src/components/importoverview/ImportOverview.vue docker/Dockerfile.backend docker/Dockerfile.db |
| diffstat | 3 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/client/src/components/importoverview/ImportOverview.vue Mon Mar 25 12:48:00 2019 +0100 +++ b/client/src/components/importoverview/ImportOverview.vue Mon Mar 25 13:44:55 2019 +0100 @@ -259,6 +259,8 @@ this.loading = false; }) .catch(error => { + this.loading = false; + this.$store.commit("imports/setCurrentDetails", {}); const { status, data } = error.response; displayError({ title: this.$gettext("Backend Error"), @@ -271,6 +273,7 @@ }) .catch(error => { const { status, data } = error.response; + this.loading = false; displayError({ title: this.$gettext("Backend Error"), message: `${status}: ${data.message || data}`
--- a/docker/Dockerfile.backend Mon Mar 25 12:48:00 2019 +0100 +++ b/docker/Dockerfile.backend Mon Mar 25 13:44:55 2019 +0100 @@ -23,4 +23,4 @@ EXPOSE 8000 -CMD ["/usr/local/bin/gemma", "-c", "/opt/gemma/example_conf.toml"] +CMD ["/usr/local/bin/gemma", "-c", "/opt/gemma/gemma.toml"]
--- a/docker/Dockerfile.db Mon Mar 25 12:48:00 2019 +0100 +++ b/docker/Dockerfile.db Mon Mar 25 13:44:55 2019 +0100 @@ -15,6 +15,7 @@ apt-key add - &&\ apt-get update &&\ apt-get -y install postgresql-11-postgis-2.5 postgresql-11-pgtap +RUN apt-get -y install --no-install-recommends postgis xsltproc jq USER postgres ENV PGBIN /usr/lib/postgresql/11/bin