Mercurial > gemma

changeset 2102:e9879eb7e965

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
importschedule: in case of UPDATE send proper document
author Thomas Junk <thomas.junk@intevation.de>
date Mon, 04 Feb 2019 13:20:01 +0100
parents 9372e4604a2c
children 404eae390298
files client/src/components/ImportStretches.vue client/src/components/importschedule/Importscheduledetail.vue client/src/components/staging/StagingDetail.vue
diffstat 3 files changed, 3 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/ImportStretches.vue	Mon Feb 04 13:01:06 2019 +0100
+++ b/client/src/components/ImportStretches.vue	Mon Feb 04 13:20:01 2019 +0100
@@ -190,11 +190,6 @@
               aria-label="nobjbn"
               v-model="nobjbn"
             />
-            <span class="text-left text-danger">
-              <small v-if="nobjbnError && !nobjbn">
-                <translate>Please enter an objectname</translate>
-              </small>
-            </span>
           </div>
         </div>
         <div class="d-flex flex-row justify-content-between">
@@ -451,7 +446,6 @@
         !this.source ||
         !this.date_info ||
         !this.objbn ||
-        !this.nobjbn ||
         !this.countryCode
       )
         return;
--- a/client/src/components/importschedule/Importscheduledetail.vue	Mon Feb 04 13:01:06 2019 +0100
+++ b/client/src/components/importschedule/Importscheduledetail.vue	Mon Feb 04 13:20:01 2019 +0100
@@ -717,8 +717,8 @@
       }
       if (this.scheduled) config["cron"] = cron;
       config["send-email"] = this.eMailNotification;
-      data["config"] = config;
       if (!this.id) {
+        data["config"] = config;
         this.$store
           .dispatch("importschedule/saveCurrentSchedule", data)
           .then(response => {
@@ -748,7 +748,7 @@
       } else {
         this.$store
           .dispatch("importschedule/updateCurrentSchedule", {
-            data: data,
+            data: config,
             id: this.id
           })
           .then(response => {
--- a/client/src/components/staging/StagingDetail.vue	Mon Feb 04 13:01:06 2019 +0100
+++ b/client/src/components/staging/StagingDetail.vue	Mon Feb 04 13:20:01 2019 +0100
@@ -17,6 +17,7 @@
           >{{ data.summary["source-organization"] }} (LOS:
           {{ data.summary.los }})</span
         >
+        <span v-if="isStretch(data.kind.toUpperCase())">STRETCH</span>
       </div>
       <div class="mt-auto mb-auto small text-left type">
         {{ data.kind.toUpperCase() }}