Merge pull request #2346 from tvdeyen/handle-trailing-slashes-in-page…

…-select Fix initial selection of internal page link select
AlchemyCMS · Jun 8, 2022 · d5c0c7a · d5c0c7a
2 parents 5f294c7 + 5b0613a
commit d5c0c7a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee b/app/assets/javascripts/alchemy/alchemy.link_dialog.js.coffee
@@ -94,7 +94,7 @@ class window.Alchemy.LinkDialog extends Alchemy.Dialog
         urlname = $element.val()
         $.get Alchemy.routes.api_pages_path,
           q:
-            urlname_eq: urlname.replace(/^\/([a-z]{2}(-[A-Z]{2})?\/)?/, '')
+            urlname_eq: urlname.replace(/^\/([a-z]{2}(-[A-Z]{2})?\/)?(.+?)\/?$/, '$3')
           page: 1
           per_page: 1,
           (data) =>

diff --git a/app/assets/stylesheets/alchemy/selects.scss b/app/assets/stylesheets/alchemy/selects.scss
@@ -42,10 +42,6 @@ select {
       font-weight: normal;
       text-align: left;
 
-      .select2-chosen {
-        overflow: visible;
-      }
-
       .select2-arrow {
         top: 0;
         width: $form-field-height;

diff --git a/vendor/assets/stylesheets/alchemy_admin/select2.scss b/vendor/assets/stylesheets/alchemy_admin/select2.scss
@@ -64,7 +64,7 @@ html[dir="rtl"] .select2-container .select2-choice {
 }
 
 .select2-container.select2-allowclear .select2-choice .select2-chosen {
-  margin-right: 42px;
+  margin-right: 38px;
 }
 
 .select2-container .select2-choice > .select2-chosen {