From 7ca7590c39dd63b2f812ce3a85ef82c2f4797aea Mon Sep 17 00:00:00 2001 From: Hester Gong Date: Wed, 19 Apr 2023 00:49:49 +0800 Subject: Fix duplicate modals when clicking on "remove all" repository button (#24129) Under Team tab of an organization, click on "remove all" repositories button will trigger two modals. Because `data-modal-id` is not proerly added. Before: https://user-images.githubusercontent.com/17645053/231988545-ac690b86-e3fe-4bf5-81c6-5ef09302e849.mov After: https://user-images.githubusercontent.com/17645053/231989678-53be4f91-fdc9-4bc5-ba11-a08aa4548e37.mov --- web_src/js/features/common-global.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'web_src/js/features') diff --git a/web_src/js/features/common-global.js b/web_src/js/features/common-global.js index 89e277ac84..0d80dc2091 100644 --- a/web_src/js/features/common-global.js +++ b/web_src/js/features/common-global.js @@ -194,8 +194,8 @@ export function initGlobalLinkActions() { const $this = $(this); const dataArray = $this.data(); let filter = ''; - if ($this.data('modal-id')) { - filter += `#${$this.data('modal-id')}`; + if ($this.attr('data-modal-id')) { + filter += `#${$this.attr('data-modal-id')}`; } const dialog = $(`.delete.modal${filter}`); @@ -237,8 +237,8 @@ export function initGlobalLinkActions() { e.preventDefault(); const $this = $(this); let filter = ''; - if ($this.attr('id')) { - filter += `#${$this.attr('id')}`; + if ($this.attr('data-modal-id')) { + filter += `#${$this.attr('data-modal-id')}`; } const dialog = $(`.addall.modal${filter}`); -- cgit v1.2.3