Mercurial > gemma

changeset 3673:256be8269227

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged configuration into default branch
author Thomas Junk <thomas.junk@intevation.de>
date Mon, 17 Jun 2019 15:51:57 +0200
parents 4909f98f8520 (current diff) 2c92e9cd0889 (diff)
children a3d1fce63c9e
files
diffstat 3 files changed, 12 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/importconfiguration/ScheduledImports.vue	Mon Jun 17 12:54:13 2019 +0200
+++ b/client/src/components/importconfiguration/ScheduledImports.vue	Mon Jun 17 15:51:57 2019 +0200
@@ -392,7 +392,7 @@
         Back
       </button>
       <div>
-        <button
+        <!-- <button
           v-if="!currentSchedule.id"
           @click="triggerManualImport"
           type="button"
@@ -401,7 +401,7 @@
         >
           <font-awesome-icon fixed-width icon="play" />
           <translate>Trigger import</translate>
-        </button>
+        </button> -->
         <button
           v-if="!directImport || !directImportAvailable"
           :disabled="!isValid"
--- a/client/src/components/importconfiguration/types/Soundingresults.vue	Mon Jun 17 12:54:13 2019 +0200
+++ b/client/src/components/importconfiguration/types/Soundingresults.vue	Mon Jun 17 15:51:57 2019 +0200
@@ -369,7 +369,13 @@
       return this.$gettext("Confirm");
     },
     dataLink() {
-      if (this.bottleneck && this.depthReference && this.import) {
+      if (
+        this.bottleneck &&
+        this.depthReference &&
+        this.importDate &&
+        this.beamType &&
+        this.projection
+      ) {
         return (
           "data:text/json;charset=utf-8," +
           encodeURIComponent(
@@ -377,7 +383,8 @@
               depthReference: this.depthReference,
               bottleneck: this.bottleneck.properties.objnam,
               date: this.importDate,
-              beamType: this.beamType
+              beamType: this.beamType,
+              projection: this.projection
             })
           )
         );
--- a/client/src/store/usermanagement.js	Mon Jun 17 12:54:13 2019 +0200
+++ b/client/src/store/usermanagement.js	Mon Jun 17 15:51:57 2019 +0200
@@ -42,6 +42,7 @@
   state: init(),
   getters: {
     userCountries: state => {
+      if (!state.users) return [];
       return state.users.reduce((o, n) => {
         o[n.user] = n.role !== "sys_admin" ? n.country : "global";
         return o;