From ea6d69eb48aa689ee410ce9b23da574c2bfe3262 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Mon, 25 Sep 2023 16:07:23 +0200
Subject: [PATCH] Fix dropdown menus hidden in modals 1241

---
 customize.dist/src/less2/include/alertify.less | 5 ++++-
 www/common/common-interface.js                 | 3 ++-
 www/common/common-ui-elements.js               | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/customize.dist/src/less2/include/alertify.less b/customize.dist/src/less2/include/alertify.less
index a11ca6392..8e4999e14 100644
--- a/customize.dist/src/less2/include/alertify.less
+++ b/customize.dist/src/less2/include/alertify.less
@@ -144,7 +144,6 @@
             display: flex;
 
             > * {
-                overflow: auto;
                 width: 100%;
                 min-width: 260px;
                 max-width: 500px;
@@ -157,6 +156,10 @@
                 }
             }
 
+            .cp-alertify-scrollable {
+                overflow: auto;
+            }
+
             .msg {
                 padding: @alertify_padding-base;
                 margin-bottom: @alertify_padding-base;
diff --git a/www/common/common-interface.js b/www/common/common-interface.js
index 53bf55582..1cf0883f4 100644
--- a/www/common/common-interface.js
+++ b/www/common/common-interface.js
@@ -536,7 +536,8 @@ define([
             message = dialog.message(msg);
         }
 
-        var frame = h('div', [
+        var cls = opt.scrollable ? '.cp-alertify-scrollable' : '';
+        var frame = h('div'+cls, [
             message,
             dialog.getButtons(opt.buttons, opt.onClose)
         ]);
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index a8992250c..c04ac2882 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -1765,7 +1765,7 @@ define([
             },
         ];
 
-        var modal = UI.dialog.customModal(content, {buttons: buttons });
+        var modal = UI.dialog.customModal(content, {scrollable: true, buttons: buttons });
         UI.openCustomModal(modal);
     };