Mercurial > gemma

changeset 4289:acb83c50dfc4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Thomas Junk <thomas.junk@intevation.de>
date Fri, 30 Aug 2019 10:09:59 +0200
parents 767a6500a666 (current diff) 69f46e9c44e2 (diff)
children 2de644208706
files
diffstat 3 files changed, 9 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/identify/formatter.js	Fri Aug 30 10:09:35 2019 +0200
+++ b/client/src/components/identify/formatter.js	Fri Aug 30 10:09:59 2019 +0200
@@ -53,7 +53,13 @@
     }
   },
   fairway_dimensions: {
-    label: app.$gettext("Fairway Dimensions")
+    label: app.$gettext("Fairway Dimensions"),
+    props: p => {
+      let propsToRemove = ["id"];
+      if (propsToRemove.indexOf(p.key) !== -1) return null;
+
+      return p;
+    }
   },
   waterway_area: {
     label: app.$gettext("Waterway Area")
--- a/client/src/components/systemconfiguration/MorphologyClassbreaks.vue	Fri Aug 30 10:09:35 2019 +0200
+++ b/client/src/components/systemconfiguration/MorphologyClassbreaks.vue	Fri Aug 30 10:09:59 2019 +0200
@@ -90,10 +90,7 @@
     <div class="mb-4 px-3">
       <a
         @click.prevent="submitClassbreaks"
-        :class="[
-          'btn btn-info btn-sm text-white',
-          { disabled: !checkValidity || hasNegativValue }
-        ]"
+        class="btn btn-info btn-sm text-white"
       >
         <translate>Send</translate>
       </a>
@@ -106,9 +103,6 @@
       <span class="text-danger" v-if="!checkValidity">
         &nbsp;<translate>Same value is used in multiple fields.</translate>
       </span>
-      <span class="text-danger" v-if="hasNegativValue">
-        &nbsp;<translate>Negative value is not allowed.</translate>
-      </span>
     </div>
     <div class="px-3">
       <h6 class="font-weight-bold">
@@ -301,14 +295,6 @@
       }
       return new Set(values).size === values.length;
     },
-    // check if there is a negative value
-    hasNegativValue() {
-      return this.morphologyClassbreaks
-        .map(m => {
-          return m[0];
-        })
-        .some(v => v < 0);
-    },
     checkValidityForMCCompare() {
       let values = [];
       for (let i = 0; i < this.morphologyClassbreaksCompare.length; i++) {
--- a/pkg/geoserver/boot.go	Fri Aug 30 10:09:35 2019 +0200
+++ b/pkg/geoserver/boot.go	Fri Aug 30 10:09:59 2019 +0200
@@ -173,6 +173,7 @@
 					{"passwd", config.DBPassword()},
 					{"dbtype", databaseType},
 					{"Primary key metadata table", primaryKeyMetadataTbl},
+					{"Expose primary keys", true},
 					{"Session startup SQL", startupSQL},
 					{"Session close-up SQL", closeupSQL},
 					{"validate connections", true},