Merge pull request #11096 from jmchilton/fix_select_button

Fix spurious "Select" button in upload.
galaxyproject · Jan 12, 2021 · 787e877 · 787e877
2 parents d93afb0 + 71f52b0
commit 787e877
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/client/src/components/Upload/Default.vue b/client/src/components/Upload/Default.vue
@@ -60,6 +60,7 @@
                 class="ui-button-default"
                 id="btn-build"
                 @click="_eventSelect"
+                v-if="selectable"
                 :disabled="!enableBuild"
                 :variant="enableBuild ? 'primary' : ''"
             >

diff --git a/client/src/components/Upload/UploadBoxMixin.js b/client/src/components/Upload/UploadBoxMixin.js
@@ -27,6 +27,10 @@ export default {
             type: Number,
             default: null,
         },
+        selectable: {
+            type: Boolean,
+            default: false,
+        },
     },
     computed: {
         btnFilesTitle() {

diff --git a/client/src/components/Upload/UploadModal.vue b/client/src/components/Upload/UploadModal.vue
@@ -16,7 +16,7 @@
         </template>
         <b-tabs v-if="ready">
             <b-tab title="Regular" id="regular" button-id="tab-title-link-regular" v-if="showRegular">
-                <default :app="this" :lazy-load-max="50" :multiple="multiple" />
+                <default :app="this" :lazy-load-max="50" :multiple="multiple" :selectable="callback != null" />
             </b-tab>
             <b-tab title="Composite" id="composite" button-id="tab-title-link-composite" v-if="showComposite">
                 <composite :app="this" />