Mercurial > gemma

changeset 2581:5466800da970

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix conditional rendering of file/URL import form elements Once import via file was chosen for an import type, the file upload field appeared also for import types that do not support file upload. Indentation will be fixed in another commit to keep the diff readable here.
author Tom Gottfried <tom@intevation.de>
date Mon, 11 Mar 2019 16:35:07 +0100
parents 5125db802b79
children ab819b1b748b
files client/src/components/importschedule/Importscheduledetail.vue
diffstat 1 files changed, 12 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/client/src/components/importschedule/Importscheduledetail.vue	Mon Mar 11 15:58:26 2019 +0100
+++ b/client/src/components/importschedule/Importscheduledetail.vue	Mon Mar 11 16:35:07 2019 +0100
@@ -172,7 +172,8 @@
             :sortBy="sortBy"
           ></Waterwayaxis>
 
-          <div v-if="!directImport" class="d-flex flex-row">
+          <template v-if="!directImport || !directImportAvailable">
+          <div class="d-flex flex-row">
             <div class="flex-column mt-3 mr-4">
               <div class="flex-row text-left">
                 <small class="text-muted">
@@ -215,7 +216,7 @@
               </div>
             </div>
           </div>
-          <div v-if="!directImport" class="flex-column w-100 mr-2">
+          <div class="flex-column w-100 mr-2">
             <div class="flex-row text-left">
               <small class="text-muted">
                 <translate>Schedule</translate>
@@ -374,7 +375,15 @@
               </div>
             </div>
           </div>
-          <div v-if="directImport" class="d-flex flex-row text-left">
+          <button
+            :disabled="!isValid"
+            type="submit"
+            class="shadow-sm btn btn-info submit-button"
+          >
+            <translate>Save</translate>
+          </button>
+          </template>
+          <div v-else class="d-flex flex-row text-left">
             <div class="mt-3 mb-3 flex-column w-100">
               <div class="custom-file">
                 <input
@@ -391,14 +400,6 @@
             </div>
           </div>
           <button
-            v-if="!directImport"
-            :disabled="!isValid"
-            type="submit"
-            class="shadow-sm btn btn-info submit-button"
-          >
-            <translate>Save</translate>
-          </button>
-          <button
             @click="triggerManualImport"
             type="button"
             class="shadow-sm btn btn-outline-info trigger"