Skip to content

Commit

Permalink
Merge pull request galaxyproject#17197 from ahmedhamidawan/modal_sele…
Browse files Browse the repository at this point in the history
…ctor_overflow_bug

[23.2] Fix Multiselect in BModal overflows out of view bug
  • Loading branch information
davelopez authored Dec 15, 2023
2 parents ad7fccb + fa6e64b commit 392c8e1
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
id="change-dbkey-of-selected-content"
title="Change Database/Build?"
title-tag="h2"
body-class="modal-with-selector"
@ok="changeDbkeyOfSelected">
<p v-localize>Select a new Database/Build for {{ numSelected }} items:</p>
<DbKeyProvider v-slot="{ item: dbkeys, loading: loadingDbKeys }">
Expand All @@ -99,14 +100,14 @@
:loading="loadingDbKeys"
:items="dbkeys"
:current-item-id="selectedDbKey"
class="mb-5 pb-5"
@update:selected-item="onSelectedDbKey" />
</DbKeyProvider>
</b-modal>
<b-modal
id="change-datatype-of-selected-content"
title="Change data type?"
title-tag="h2"
body-class="modal-with-selector"
:ok-disabled="selectedDatatype == null"
@ok="changeDatatypeOfSelected">
<p v-localize>Select a new data type for {{ numSelected }} items:</p>
Expand All @@ -116,7 +117,6 @@
:loading="loadingDatatypes"
:items="datatypes"
:current-item-id="selectedDatatype"
class="mb-5 pb-5"
@update:selected-item="onSelectedDatatype" />
</DatatypesProvider>
</b-modal>
Expand Down Expand Up @@ -347,3 +347,9 @@ export default {
},
};
</script>

<style>
.modal-with-selector {
overflow: initial;
}
</style>
2 changes: 1 addition & 1 deletion client/src/components/Upload/UploadModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,6 @@ defineExpose({
.upload-dialog-body {
height: 500px;
overflow: hidden;
overflow: initial;
}
</style>

0 comments on commit 392c8e1

Please sign in to comment.