From 1c4a7551f75ef25aacaf67b8a431caf4c0448330 Mon Sep 17 00:00:00 2001
From: Makurin <dmitry.makurin@red-soft.ru>
Date: Tue, 11 Oct 2022 11:17:52 +0300
Subject: [PATCH 1/2] Enable select2 for list/enumerations custom fields

---
 assets/javascripts/searchable_selectbox.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/assets/javascripts/searchable_selectbox.js b/assets/javascripts/searchable_selectbox.js
index dedb790..ab4141c 100644
--- a/assets/javascripts/searchable_selectbox.js
+++ b/assets/javascripts/searchable_selectbox.js
@@ -90,6 +90,14 @@ function replaceSelect2() {
     if (excludedSelect.length) {
       excludedSelect.select2('destroy');
     }
+
+    /* Enable select2 for list and enumerations Custom Fields formats */
+    const customFields = $('select.enumeration_cf, select.list_cf');
+    if (customFields.length) {
+      customFields.select2().on('select2:select', function() {
+        retriggerChangeIfNativeEventExists($(this));
+      });
+    }
   }
 }
 

From 6bff1e196478412b159de26128284b8812d8b1df Mon Sep 17 00:00:00 2001
From: ishikawa999 <remember929@gmail.com>
Date: Wed, 12 Oct 2022 01:29:30 +0000
Subject: [PATCH 2/2] Add enabled_multiple_selectbox setting

---
 .../_searchable_selectbox_settings.html.erb   | 11 +++--
 assets/javascripts/searchable_selectbox.js    | 30 ++++++------
 assets/stylesheets/searchable_selectbox.css   | 46 +++++++++++++++----
 config/locales/en.yml                         |  3 +-
 config/locales/ja.yml                         |  3 +-
 init.rb                                       |  2 +-
 lib/searchable_selectbox/hook_listener.rb     | 11 +++--
 7 files changed, 74 insertions(+), 32 deletions(-)

diff --git a/app/views/settings/_searchable_selectbox_settings.html.erb b/app/views/settings/_searchable_selectbox_settings.html.erb
index 98b34f9..6f626ae 100644
--- a/app/views/settings/_searchable_selectbox_settings.html.erb
+++ b/app/views/settings/_searchable_selectbox_settings.html.erb
@@ -1,4 +1,9 @@
 <p>
-    <%= label_tag('settings[enabled]', I18n.t(:label_enable_seachable_selectbox)) %>
-    <%= check_box_tag('settings[enabled]', 1, settings['enabled']) %>
-</p>
\ No newline at end of file
+  <%= label_tag('settings[enabled]', I18n.t(:label_enable_seachable_selectbox)) %>
+  <%= check_box_tag('settings[enabled]', 1, settings['enabled']) %>
+</p>
+<p>
+  <%= label_tag('settings[enabled_multiple_selectbox]', I18n.t(:label_enable_multiple_selectbox)) %>
+  <%= hidden_field_tag 'settings[enabled_multiple_selectbox]', 0, class: 'enabled_multiple_selectbox' %>
+  <%= check_box_tag('settings[enabled_multiple_selectbox]', 1, Setting.plugin_redmine_searchable_selectbox['enabled_multiple_selectbox'].to_s == '1', class: 'enabled_multiple_selectbox') %>
+</p>
diff --git a/assets/javascripts/searchable_selectbox.js b/assets/javascripts/searchable_selectbox.js
index ab4141c..e43e3be 100644
--- a/assets/javascripts/searchable_selectbox.js
+++ b/assets/javascripts/searchable_selectbox.js
@@ -48,7 +48,7 @@ $(function() {
     var oldAddFilter = window.addFilter;
     window.addFilter = function(field, operator, values){
       oldAddFilter(field, operator, values);
-      $('#filters-table select:not([multiple]):not([data-remote]):not(.select2-hidden-accessible)').select2();
+      $('#filters-table select:not([data-remote]):not(.select2-hidden-accessible)'+selectorForMultipleSelectbox()).select2();
       $('#select2-add_filter_select-container.select2-selection__rendered').text('');
     }
 
@@ -56,7 +56,11 @@ $(function() {
     window.toggleMultiSelect = function(el){
       oldToggleMultiSelect(el);
       if (el.attr('multiple')) {
-        el.select2('destroy');
+        if (window.enabledMultipleSelectboxSearchable === true) {
+          el.select2();
+        } else {
+          el.select2('destroy');
+        }
       } else {
         el.select2();
       }
@@ -70,7 +74,7 @@ function replaceSelect2() {
   if ($('body').hasClass('controller-workflows')) {
     return;
   } else {
-    var selectInTabular = $('.tabular .splitcontent select:not([multiple]):not([data-remote]):not(.select2-hidden-accessible)');
+    var selectInTabular = $('.tabular .splitcontent select:not([data-remote]):not(.select2-hidden-accessible)'+selectorForMultipleSelectbox());
     if (selectInTabular.length) {
       selectInTabular.select2({
         width: 'style'
@@ -79,7 +83,7 @@ function replaceSelect2() {
       });
     }
 
-    var other = $('select:not([multiple]):not([data-remote]):not(.select2-hidden-accessible)');
+    var other = $('select:not([data-remote]):not(.select2-hidden-accessible)'+selectorForMultipleSelectbox());
     if (other.length) {
       other.select2().on('select2:select', function() {
         retriggerChangeIfNativeEventExists($(this));
@@ -90,14 +94,6 @@ function replaceSelect2() {
     if (excludedSelect.length) {
       excludedSelect.select2('destroy');
     }
-
-    /* Enable select2 for list and enumerations Custom Fields formats */
-    const customFields = $('select.enumeration_cf, select.list_cf');
-    if (customFields.length) {
-      customFields.select2().on('select2:select', function() {
-        retriggerChangeIfNativeEventExists($(this));
-      });
-    }
   }
 }
 
@@ -119,4 +115,12 @@ function retriggerChangeIfNativeEventExists(element) {
   if (element.data('use-add-change-event-listener') && typeof Rails != 'undefined') {
     Rails.fire(element[0], 'change')
   }
-}
\ No newline at end of file
+}
+
+function selectorForMultipleSelectbox() {
+  if (window.enabledMultipleSelectboxSearchable === true) {
+    return ':not(.query-columns [multiple])'
+  } else {
+    return ':not([multiple])'
+  }
+}
diff --git a/assets/stylesheets/searchable_selectbox.css b/assets/stylesheets/searchable_selectbox.css
index 7a1d915..085275c 100644
--- a/assets/stylesheets/searchable_selectbox.css
+++ b/assets/stylesheets/searchable_selectbox.css
@@ -1,4 +1,4 @@
-.select2-container--default .select2-selection--single {
+.select2-container--default .select2-selection {
   -webkit-appearance: none;
   -moz-appearance: none;
   -ms-appearance: none;
@@ -15,8 +15,13 @@
   font-family: Verdana, sans-serif;
 }
 
-.select2-container--default .select2-selection--single:focus {
-  border: 1px solid #5ad;
+.select2-container--default .select2-selection--multiple {
+  height: auto;
+}
+
+.select2-container--default .select2-selection:focus,
+.select2-container--default.select2-container--focus .select2-selection--multiple {
+  border: 1px solid #5ad !important;
   outline: none;
 }
 
@@ -25,7 +30,7 @@
   font-family: Verdana, sans-serif;
 }
 
-.select2-container--default .select2-selection--single .select2-selection__rendered {
+.select2-container--default .select2-selection .select2-selection__rendered {
   color: #333;
   line-height: 22px;
 }
@@ -35,18 +40,22 @@ fieldset#filters td.values .select2-container--default {
   max-width: 230px;
   min-width: 140px;
 }
+
 .tabular .select2-container {
   min-width: 150px;
 }
+
 .select2-container {
   min-width: 100px;
 }
+
 .tabular .splitcontent .select2-container {
   width: 75%;
   max-width: 300px;
 }
-#add_filter_select + .select2-container,
-#group_by + .select2-container {
+
+#add_filter_select+.select2-container,
+#group_by+.select2-container {
   min-width: 200px;
 }
 
@@ -54,35 +63,54 @@ fieldset#filters td.values .select2-container--default {
   -webkit-appearance: none;
   width: 12px;
 }
+
 .select2-results__options::-webkit-scrollbar-thumb {
   border-radius: 4px;
   background-color: #00000080;
   box-shadow: 0 0 1px #ffffff80;
 }
+
 .select2-results__options li {
   padding: 3px 6px;
 }
 
 /* Increase the height of the select box */
-.select2-container--default .select2-results>.select2-results__options{
+.select2-container--default .select2-selection--single .select2-results>.select2-results__options {
   max-height: 450px;
 }
 
 /* Change the style referring to the default theme of Redmine */
 .select2-search--dropdown input.select2-search__field {
-  background: #fff url(../../../images/magnifier.png) no-repeat 2px 50%;
+  background: #fff url(../../../../images/magnifier.png) no-repeat 2px 50%;
   padding-left: 20px;
 }
+
 .select2-search--dropdown input.select2-search__field:focus {
   border: 1px solid #5ad;
   outline: none;
 }
+
 li.select2-results__option--highlighted[role="option"][aria-selected] {
   background-color: #759FC2;
   color: #fff;
 }
+
 .select2-dropdown {
   padding-bottom: 5px;
   box-shadow: 0 3px 3px 0 rgba(0, 0, 0, .5);
   border: none;
-}
\ No newline at end of file
+}
+
+.select2-selection--multiple:before {
+  content: "";
+  position: absolute;
+  right: 7px;
+  top: 42%;
+  border-top: 5px solid #888;
+  border-left: 4px solid transparent;
+  border-right: 4px solid transparent;
+}
+
+.query-columns select[multiple] {
+  min-height: 200px;
+}
diff --git a/config/locales/en.yml b/config/locales/en.yml
index b584a46..cf386fc 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,2 +1,3 @@
 en:
-  label_enable_seachable_selectbox: Enable searchable selectbox
\ No newline at end of file
+  label_enable_seachable_selectbox: Enable searchable selectbox
+  label_enable_multiple_selectbox: Make the multiple selection box searchable
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index eac5658..1bc7e2f 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1,2 +1,3 @@
 ja:
-  label_enable_seachable_selectbox: Searchable selectboxを使用
\ No newline at end of file
+  label_enable_seachable_selectbox: Searchable selectboxを使用
+  label_enable_multiple_selectbox: 複数選択可能なセレクトボックスも検索可能にする
diff --git a/init.rb b/init.rb
index bc51965..ec42cde 100644
--- a/init.rb
+++ b/init.rb
@@ -6,7 +6,7 @@
   description "This plugin changes Redmine's selectbox searchable."
   version '0.1.10'
 
-  settings default: {'enabled' => 1}, partial: 'settings/searchable_selectbox_settings'
+  settings default: {'enabled' => 1, 'enabled_multiple_selectbox' => 1}, partial: 'settings/searchable_selectbox_settings'
 end
 
 Rails.configuration.to_prepare do
diff --git a/lib/searchable_selectbox/hook_listener.rb b/lib/searchable_selectbox/hook_listener.rb
index e6c1c8d..63d7b21 100644
--- a/lib/searchable_selectbox/hook_listener.rb
+++ b/lib/searchable_selectbox/hook_listener.rb
@@ -3,10 +3,13 @@ class HookListener < Redmine::Hook::ViewListener
     def view_layouts_base_html_head(context)
       return '' unless Setting.plugin_redmine_searchable_selectbox['enabled']
 
-      stylesheet_link_tag("select2.min", :plugin => "redmine_searchable_selectbox") +
-      stylesheet_link_tag("searchable_selectbox", :plugin => "redmine_searchable_selectbox") +
-      javascript_include_tag("select2.full.min.js", :plugin => "redmine_searchable_selectbox") +
-      javascript_include_tag("searchable_selectbox.js", :plugin => "redmine_searchable_selectbox")
+      tags =
+        stylesheet_link_tag("select2.min", :plugin => "redmine_searchable_selectbox") +
+        stylesheet_link_tag("searchable_selectbox", :plugin => "redmine_searchable_selectbox") +
+        javascript_include_tag("select2.full.min.js", :plugin => "redmine_searchable_selectbox") +
+        javascript_include_tag("searchable_selectbox.js", :plugin => "redmine_searchable_selectbox")
+      tags += javascript_tag('var enabledMultipleSelectboxSearchable = true;') if Setting.plugin_redmine_searchable_selectbox['enabled_multiple_selectbox'].to_i == 1
+      tags
     end
   end
 end