From 6d659a59624fb6f56eec37124f30ab1e187fe490 Mon Sep 17 00:00:00 2001 From: ishikawa999 Date: Fri, 3 Jun 2022 01:20:05 +0000 Subject: [PATCH 1/3] Fix setSelect2() to also run when changing languages --- app/views/custom_message_settings/edit.js.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/custom_message_settings/edit.js.erb b/app/views/custom_message_settings/edit.js.erb index 8e79ed2..f16d22b 100644 --- a/app/views/custom_message_settings/edit.js.erb +++ b/app/views/custom_message_settings/edit.js.erb @@ -1,3 +1,4 @@ $('#edit-custom-messages').html("<%= j (render 'custom_message_settings/messages', lang: @lang) %>"); $('#default-messages-link').replaceWith('<%= open_default_messages_window_link(@lang) %>') +setSelect2(); $('#ajax-indicator').hide(); \ No newline at end of file From 3f04720b7c31f1ec095b51dbe4d9fb681fc77248 Mon Sep 17 00:00:00 2001 From: ishikawa999 Date: Fri, 3 Jun 2022 01:20:37 +0000 Subject: [PATCH 2/3] Fix a problem with focus not working in Redmine 5.0 or later --- app/views/custom_message_settings/_messages.html.erb | 8 +++++++- assets/stylesheets/custom_messages.css | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/views/custom_message_settings/_messages.html.erb b/app/views/custom_message_settings/_messages.html.erb index 5110a24..3987440 100644 --- a/app/views/custom_message_settings/_messages.html.erb +++ b/app/views/custom_message_settings/_messages.html.erb @@ -12,7 +12,13 @@ $(document).ready(function() { setSelect2(); }); -let currentSearchKeyword; +// Fix a problem with focus not working in Redmine 5.0 or later. +// issue: https://github.com/select2/select2/issues/5993 +$(document).on('select2:open', function() { + document.querySelector('.select2-search__field').focus(); +}); + +var currentSearchKeyword; $('#key-selector').on('select2:select', function (e) { var key = e.params.data.id; var val = e.params.data.text; diff --git a/assets/stylesheets/custom_messages.css b/assets/stylesheets/custom_messages.css index 35e6eb4..0f34cba 100644 --- a/assets/stylesheets/custom_messages.css +++ b/assets/stylesheets/custom_messages.css @@ -26,7 +26,7 @@ text-decoration: none; } -.select2-container--default .select2-results__option span.key { +.select2-container--default .select2-results__option:not(.select2-results__option--highlighted) span.key { color: gray; } .select2-container--default .select2-results__option[aria-disabled=true] { From 288c9de028764973e0c2b890dcc87f0459510295 Mon Sep 17 00:00:00 2001 From: ishikawa999 Date: Fri, 3 Jun 2022 01:21:25 +0000 Subject: [PATCH 3/3] Update plugin version 0.1.3 to 0.1.4 --- init.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.rb b/init.rb index a8fa828..322e75d 100644 --- a/init.rb +++ b/init.rb @@ -5,7 +5,7 @@ p = Redmine::Plugin.register :redmine_message_customize do name 'Redmine message customize plugin' - version '0.1.3' + version '0.1.4' description 'This is a plugin that allows messages in Redmine to be overwritten from the admin view' settings default: { custom_messages: {} } menu :admin_menu, :custom_messages, { controller: 'custom_message_settings', action: 'edit' },