From 85cd24fa817e60f32ad7a5b0e3040cac2a93b33c Mon Sep 17 00:00:00 2001 From: Gregor Lasnibat <143816208+lasniscinote@users.noreply.github.com> Date: Tue, 23 Jan 2024 09:26:30 +0100 Subject: [PATCH] (fix) Assign from task page is closed at opening item card [SCI-10063] (#6985) --- .../vue/repository_item_sidebar/RepositoryItemSidebar.vue | 8 ++------ .../my_modules/repositories/_full_view_modal.html.erb | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue b/app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue index 02e134d08..1a124a4d8 100644 --- a/app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue +++ b/app/javascript/vue/repository_item_sidebar/RepositoryItemSidebar.vue @@ -546,12 +546,8 @@ export default { }, handleOpeningFromBootstrapModal() { const layout = document.querySelector('.sci--layout'); - const openModals = layout.querySelectorAll('.modal'); - openModals.forEach((modal) => { - if ($(modal).hasClass('in') && !$(modal).hasClass('full-screen')) { - $(modal).modal('hide'); - } - }); + const openModals = layout.querySelectorAll('.modal.in:not(.modal-full-screen)'); + openModals.forEach((modal) => $(modal).modal('hide')); }, loadRepositoryRow(repositoryRowUrl, scrollTop = 0) { this.dataLoading = true; diff --git a/app/views/my_modules/repositories/_full_view_modal.html.erb b/app/views/my_modules/repositories/_full_view_modal.html.erb index 8a1d2f619..2a898a4b3 100644 --- a/app/views/my_modules/repositories/_full_view_modal.html.erb +++ b/app/views/my_modules/repositories/_full_view_modal.html.erb @@ -1,4 +1,4 @@ -