additional_tags 1.0.2 → 1.0.5

data/app/views/additional_tags/settings/_manage_tags.html.slim

@@ -1,29 +1,29 @@
 - tags = manageable_tags
 - if tags.present?
-  table.list.issues
-    thead
-      tr
-        th.checkbox.hide-when-print
-          = check_box_tag 'ids[]', '', false, class: 'toggle-selection',
-                          title: "#{l :button_check_all}/#{l :button_uncheck_all}"
+  .autoscroll
+    table.list.issues
+      thead
+        tr
+          th.checkbox.hide-when-print
+            = check_box_tag 'ids[]', '', false, class: 'toggle-selection',
+                            title: "#{l :button_check_all}/#{l :button_uncheck_all}"
 
-        th = l :field_name
-        - manageable_tag_columns.each do |_column, column_values|
-          th = column_values[:label]
-        th
-    tbody
-      - tags.each do |tag|
-        tr.hascontextmenu id="#{tag.id}"
-          td.checkbox.hide-when-print
-           = check_box_tag 'ids[]', tag.id, false, id: nil
-          td = additional_tag_link tag, link: edit_additional_tag_path(tag)
-          - manageable_tag_column_values(tag).each do |column|
-            td = column
-          td.buttons
-            = link_to l(:button_edit), edit_additional_tag_path(tag),
-                      class: 'icon icon-edit'
-            = link_to l(:button_delete), additional_tags_path(ids: tag), method: :delete,
-                      data: { confirm: l(:text_are_you_sure) }, class: 'icon icon-del'
+          th = l :field_name
+          - manageable_tag_columns.each do |_column, column_values|
+            th = column_values[:label]
+          th
+      tbody
+        - tags.each do |tag|
+          tr.hascontextmenu id="#{tag.id}"
+            td.checkbox.hide-when-print
+              = check_box_tag 'ids[]', tag.id, false, id: nil
+            td = additional_tag_link tag, link: edit_additional_tag_path(tag)
+            - manageable_tag_column_values(tag).each do |column|
+              td = column
+            td.buttons
+              = link_to l(:button_edit), edit_additional_tag_path(tag),
+                        class: 'icon icon-edit'
+              = delete_link additional_tags_path(ids: tag)
 - else
   p.nodata = l :label_no_data
 

data/app/views/common/_tag_summary_block.html.slim

@@ -0,0 +1,11 @@
+ul.reporting-list.tag-summary
+  li.amount-tags
+    = l :label_amount_tags
+    ' :
+    span.value
+      = tags.to_a.size
+  li.amount-entities-with-tags
+    = l :label_amount_entities_with_tags, name: entities_label
+    ' :
+    span.value
+      = totals_link

data/app/views/context_menus/_issues_tags.html.slim

@@ -5,6 +5,6 @@
     ul
       li
         = context_menu_link l(:button_add),
-                            edit_issue_tags_path(ids: @issue_ids),
+                            edit_issue_tags_path(ids: @issue_ids, search: params[:search]),
                             remote: true,
                             class: 'icon icon-add'

data/app/views/dashboards/blocks/_issue_tags.html.slim

@@ -0,0 +1,58 @@
+h3 = block_definition[:label]
+
+- open_issues_only = RedminePluginKit.true? settings[:open_issues_only]
+- tags = Issue.available_tags project: @project, open_issues_only: open_issues_only
+- counts = AdditionalTags::Tags.entity_group_by scope: Issue.group_by_status_with_tags(@project),
+                                                tags: tags,
+                                                statuses: { true => :closed, false => :open },
+                                                group_id_is_bool: true
+
+= render partial: 'common/tag_summary_block',
+         locals: { tags: tags,
+                   entities_label: l(:label_issue_plural),
+                   totals_link: link_to_issue_tags_totals(entries: counts,
+                                                          project: @project,
+                                                          open_issues_only: open_issues_only) }
+
+- if RedminePluginKit.true? settings[:with_table_of_values]
+  - if tags.present?
+    - tags = sort_tags_for_list tags.to_a
+    table.list.tags
+      thead
+        tr
+          th = l :field_name
+          - if open_issues_only
+            th = l :label_quantity
+          - else
+            th = l :label_open_issues_plural
+            th = l :label_closed_issues_plural
+            th = l :label_total
+      tbody
+        - tags.each do |tag|
+          tr
+            td.name = additional_tag_link tag,
+                                          tag_action: 'index',
+                                          tag_controller: 'issues',
+                                          filter: issue_tag_status_filter(open_issues_only: open_issues_only),
+                                          use_colors: RedminePluginKit.true?(settings[:use_colors])
+            - unless open_issues_only
+              td.value = additional_tag_link tag,
+                                             tag_action: 'index',
+                                             tag_controller: 'issues',
+                                             filter: issue_tag_status_filter(operator: 'o'),
+                                             use_colors: false,
+                                             name: counts[tag.name][:open]
+              td.value = additional_tag_link tag,
+                                             tag_action: 'index',
+                                             tag_controller: 'issues',
+                                             filter: issue_tag_status_filter(operator: 'c'),
+                                             use_colors: false,
+                                             name: counts[tag.name][:closed]
+            td.value = additional_tag_link tag,
+                                           tag_action: 'index',
+                                           tag_controller: 'issues',
+                                           filter: issue_tag_status_filter(open_issues_only: open_issues_only),
+                                           use_colors: false,
+                                           name: open_issues_only ? counts[tag.name][:open] : counts[tag.name][:total]
+  - else
+    p.nodata = l :label_no_data

data/app/views/dashboards/blocks/_issue_tags_settings.html.slim

@@ -0,0 +1,20 @@
+.box.tabular.settings
+  p
+    = additionals_settings_checkbox :with_table_of_values,
+                                    active_value: settings[:with_table_of_values],
+                                    tag_name: "settings[#{block}][with_table_of_values]"
+
+  / p
+  /   = additionals_settings_checkbox :with_chart,
+  /                                   active_value: settings[:with_chart],
+  /                                   tag_name: "settings[#{block}][with_chart]"
+
+  p
+    = additionals_settings_checkbox :open_issues_only,
+                                    active_value: settings[:open_issues_only],
+                                    tag_name: "settings[#{block}][open_issues_only]"
+
+  p
+    = additionals_settings_checkbox :use_colors,
+                                    active_value: settings[:use_colors],
+                                    tag_name: "settings[#{block}][use_colors]"

data/app/views/issue_tags/_edit_modal.html.slim

@@ -9,7 +9,7 @@ h3.title = l :label_add_tags
   h3
     span = link_to_issue @issues.first
 
-= form_tag issue_tags_path(ids: @issue_ids) do
+= form_tag issue_tags_path(ids: @issue_ids, search: params[:search]) do
   fieldset.box
     legend = l :field_tags
     #issue_tags
@@ -22,9 +22,11 @@ h3.title = l :label_add_tags
                                 tags: User.current.allowed_to?(:create_issue_tags, @project)
     p.most_used_tags
       = safe_join @most_used_tags.collect { |t| tag.span t.name, class: 'most_used_tag' }, ', '
-    = javascript_tag "var mostUsedTags = #{@most_used_tags.map(&:name)}"
 
   .buttons
     = submit_tag l(:button_add), name: nil
     '
     = link_to_function l(:button_cancel), 'hideModal(this);'
+
+javascript:
+  var mostUsedTags = #{raw @most_used_tags.map(&:name)};

data/app/views/issues/_tags_sidebar.html.slim

@@ -1,5 +1,8 @@
 - if AdditionalTags.setting?(:active_issue_tags) && \
-     User.current.allowed_to?(:view_issue_tags, @project, global: true) && sidebar_tags.present?
+     User.current.allowed_to?(:view_issue_tags, @project, global: true) && \
+     defined?(sidebar_tags) && \
+     sidebar_tags.present?
+
   .sidebar-tags
     h3 = l :field_tags
     = render_sidebar_tags

data/assets/javascripts/tags.js

@@ -1,5 +1,6 @@
-$(function () {
-  $('body').on('click', '.most_used_tags .most_used_tag', function (e) {
+/* global mostUsedTags:writable */
+$(function() {
+  $('body').on('click', '.most_used_tags .most_used_tag', function(e) {
     var $tagsSelect = $('select#issue_tag_list');
     var tag = e.target.innerText;
     if ($tagsSelect.find('option[value=\'' + tag + '\']').length === 0) {
@@ -7,7 +8,7 @@ $(function () {
       $tagsSelect.append(newOption).trigger('change');
     }
 
-    var mostUsedTags = $.grep(mostUsedTags, function(t) { return t != tag; });
+    mostUsedTags = $.grep(mostUsedTags, function(t) { return t != tag; });
     var tagsHtml = mostUsedTags.map(function(tag) {
       return '<span class="most_used_tag">' + tag + '</span>';
     }).join(', ');

data/assets/stylesheets/tags.css

@@ -26,8 +26,8 @@ ul.tags li { margin: 0.25em 0; }
 
 span.additional-tag-label-color {
   display: inline-block;
-  margin-bottom: 5px !important;
-  border-radius: 2px !important;
+  margin-bottom: 3px !important;
+  border-radius: 0.75rem !important;
 }
 
 td.tags span.additional-tag-label-color {
@@ -37,27 +37,41 @@ td.tags span.additional-tag-label-color {
 }
 
 .additional-tag-label-color {
-  padding: 2px 4px;
-  font-size: 10px !important;
+  padding: 0 5px;
+  line-height: initial;
+  font-size: 0.7rem !important;
   border: 1px solid rgba(0, 0, 0, 0.2);
-  border-radius: 2px;
+  border-radius: 0.75rem;
 }
 
-.additional-tag-label-color a::before {
-  font-family: Font Awesome\ 5 Free;
-  font-size: 0.9em;
-  font-weight: 900;
-  content: "\f02b"; /* fas fa-tag */
-  padding-right: 3px;
+.additional-tag-label-color .tag-count {
+  display: inline-block;
+  background: #fff;
+  color: #1f1f1f;
+  padding-right: 5px;
+  border-top-right-radius: 0.7rem;
+  border-bottom-right-radius: 0.7rem;
+  margin-right: -5px;
+  padding-left: 3px;
+}
+
+.tag-label .tag-count {
+  background: #f1f5fa;
+  border-radius: 5px;
+  padding: 0 5px;
+  color: #666;
+  border: 1px solid #ddd;
+  vertical-align: middle;
 }
 
 .additional-tag-label-color .tag-count,
 .tag-label .tag-count {
-  font-size: 0.75em;
+  font-size: 0.7rem;
   margin-left: 0.5em;
 }
 
-span.additional-tag-label-color:hover a {
+span.additional-tag-label-color:hover a,
+.tag-label .tag-count:hover a {
   text-decoration: none !important;
 }
 

data/config/initializers/zeitwerk.rb

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+plugin_dir = RedminePluginKit::Loader.plugin_dir plugin_id: 'additional_tags'
+Rails.autoloaders.main.push_dir "#{plugin_dir}/lib"

data/config/locales/bg.yml

@@ -31,3 +31,8 @@ bg:
   tags_sort_by_name: "Име"
   label_tags_sort_by: "Сортиране на маркерите по"
   label_tags_suggestion_order: "Ред на предлагане"
+  label_with_table_of_values: "С таблица на стойността"
+  label_with_chart: "С графиком"
+  label_amount_tags: "Теги Сумма"
+  label_amount_entities_with_tags: "Сумма %{name} с тегами"
+  label_quantity: "Количество"

data/config/locales/cs.yml

@@ -31,3 +31,8 @@ cs:
   tags_sort_by_name: "Název"
   label_tags_sort_by: "Řazení značek podle"
   label_tags_suggestion_order: "Objednávka návrhu"
+  label_with_table_of_values: "S tabulkou hodnot"
+  label_with_chart: "S grafem"
+  label_amount_tags: "Částka TAGy"
+  label_amount_entities_with_tags: "Částka %{name} s TAGy"
+  label_quantity: "Množství"

data/config/locales/de.yml

@@ -31,3 +31,8 @@ de:
   tags_sort_by_name: Name
   label_tags_sort_by: Sortiere TAGs nach
   label_tags_suggestion_order: Reihenfolge der Vorschläge
+  label_with_table_of_values: Mit Wertetabelle
+  label_with_chart: Mit Chart
+  label_amount_tags: Anzahl TAGs
+  label_amount_entities_with_tags: Anzahl %{name} mit TAGs
+  label_quantity: Anzahl

data/config/locales/en.yml

@@ -31,3 +31,8 @@ en:
   tags_sort_by_name: "Name"
   label_tags_sort_by: "Sort tags by"
   label_tags_suggestion_order: "Suggestion order"
+  label_with_table_of_values: "With table of values"
+  label_with_chart: "With chart"
+  label_amount_tags: "Amount tags"
+  label_amount_entities_with_tags: "Amount %{name} with tags"
+  label_quantity: "Quantity"

data/config/locales/es.yml

@@ -31,3 +31,8 @@ es:
   tags_sort_by_name: "Nombre"
   label_tags_sort_by: "Ordenar las tags por"
   label_tags_suggestion_order: "Orden de sugerencia"
+  label_with_table_of_values: "Con tabla de valores"
+  label_with_chart: "Con tabla"
+  label_amount_tags: "Valor tags"
+  label_amount_entities_with_tags: "Cantidad %{name} con tags"
+  label_quantity: "Ctd."

data/config/locales/fr.yml

@@ -31,3 +31,8 @@ fr:
   tags_sort_by_name: "Nom"
   label_tags_sort_by: "Trier les balises par"
   label_tags_suggestion_order: "Ordre de suggestion"
+  label_with_table_of_values: "Avec tableau de valeur"
+  label_with_chart: "Avec tableau"
+  label_amount_tags: "Montant tags"
+  label_amount_entities_with_tags: "Montant %{name} avec tags"
+  label_quantity: "Quantité"

data/config/locales/it.yml

@@ -31,3 +31,8 @@ it:
   tags_sort_by_name: "Nome"
   label_tags_sort_by: "Ordina i tag per"
   label_tags_suggestion_order: "Ordine di suggerimento"
+  label_with_table_of_values: With table of values
+  label_with_chart: With chart
+  label_amount_tags: Amount tags
+  label_amount_entities_with_tags: Amount %{name} with tags
+  label_quantity: "Numero"

data/config/locales/ja.yml

@@ -31,3 +31,8 @@ ja:
   tags_sort_by_name: "名前"
   label_tags_sort_by: "タグを並べ替える"
   label_tags_suggestion_order: "ご提案の順番"
+  label_with_table_of_values: "価値観のテーブル付き"
+  label_with_chart: "チャート付き"
+  label_amount_tags: "金額  tags"
+  label_amount_entities_with_tags: "金額 %{name} tags付き"
+  label_quantity: "数量"

data/config/locales/ko.yml

@@ -31,3 +31,8 @@ ko:
   tags_sort_by_name: "이름"
   label_tags_sort_by: "태그 정렬 기준"
   label_tags_suggestion_order: "제안 순서"
+  label_with_table_of_values: "가치 테이블"
+  label_with_chart: "차트 포함"
+  label_amount_tags: "금액 태그"
+  label_amount_entities_with_tags: "TAG가 있는 금액 %{name}"
+  label_quantity: "수량"

data/config/locales/pl.yml

@@ -31,3 +31,8 @@ pl:
   tags_sort_by_name: "Nazwa"
   label_tags_sort_by: "Sortuj znaczniki według"
   label_tags_suggestion_order: "Zamówienie ofertowe"
+  label_with_table_of_values: "Z tabelą wartości"
+  label_with_chart: "Z wykresem"
+  label_amount_tags: "Kwota Tags"
+  label_amount_entities_with_tags: "Kwota %{name} z Tags"
+  label_quantity: "Ilość"

data/config/locales/pt-BR.yml

@@ -31,3 +31,8 @@ pt-BR:
   tags_sort_by_name: "Nome"
   label_tags_sort_by: "Ordenar tags por"
   label_tags_suggestion_order: "Pedido de sugestão"
+  label_with_table_of_values: "Com tabela de valores"
+  label_with_chart: "Com gráfico"
+  label_amount_tags: "Valor Etiquetas"
+  label_amount_entities_with_tags: "Quantidade %{name} com etiquetas"
+  label_quantity: "Quantidade"

data/config/locales/ru.yml

@@ -1,33 +1,38 @@
 ru:
-  field_tag_list: Tags
-  field_tags: Tags
-  field_issue_tags: Issue tags
-  label_active_issue_tags: "Активировать теги проблем"
-  label_active_wiki_tags: "Активировать вики-теги"
-  label_add_tags: "Добавить теги"
+  field_tag_list: Теги
+  field_tags: Теги
+  field_issue_tags: Теги задач
+  label_active_issue_tags: "Активировать теги задач"
+  label_active_wiki_tags: "Активировать теги вики"
+  label_add_tags: "Добавьте теги"
   label_edit_tags: "Редактировать теги"
-  label_manage_tags: "Управляющие метки"
+  label_manage_tags: "Управление тегами"
   label_merge_selected_tags: "Объединить выбранные теги"
-  label_open_issues_only: "Отображать только открытые вопросы"
-  label_show_with_count: "Отображаемое количество на теге"
-  label_tags_tag: "Tag"
+  label_open_issues_only: "Отображать только открытые задачи"
+  label_show_with_count: "Отображать количество на теге"
+  label_tags_tag: "Тег"
   label_use_colors: "Использовать цвета"
   label_wiki_index_for_tag_html: "Вики-страницы с тегом <em>%{tag}</em>"
   notice_failed_to_add_tags: "Не удалось добавить теги"
   notice_tags_added: "Теги добавлены"
-  permission_add_wiki_tags: "Добавить вики-теги"
-  permission_create_issue_tags: "Добавить теги проблемы"
-  permission_edit_issue_tags: "Редактирование тематических тегов"
-  permission_view_issue_tags: "Отображать проблемные теги"
-  tags_order_by_last_created: "Последний созданный"
-  tags_order_by_count: "Наиболее часто используемый"
+  permission_add_wiki_tags: "Добавление тегов вики"
+  permission_create_issue_tags: "Добавление тегов задач"
+  permission_edit_issue_tags: "Редактирование тегов задач"
+  permission_view_issue_tags: "Просмотр тегов задач"
+  tags_order_by_last_created: "Недавно созданные"
+  tags_order_by_count: "Наиболее часто используемые"
   tags_order_by_name: "Имя"
-  tags_sidebar_cloud: "Cloud"
+  tags_sidebar_cloud: "Облако"
   tags_sidebar_list: "Список"
   tags_sidebar_none: "Нет"
-  tags_sidebar_simple_cloud: "Simple cloud"
-  label_tags_sidebar: "DОтображать теги на боковой панели как"
-  tags_sort_by_count: "Посчитать"
-  tags_sort_by_name: "Имя"
-  label_tags_sort_by: "Сортировать метки по"
-  label_tags_suggestion_order: "Порядок предложения"
+  tags_sidebar_simple_cloud: "Простое облако"
+  label_tags_sidebar: "Способ отображения тегов на боковой панели"
+  tags_sort_by_count: "Количеству"
+  tags_sort_by_name: "Имени"
+  label_tags_sort_by: "Сортировать теги по"
+  label_tags_suggestion_order: "Порядок предложения при вводе"
+  label_with_table_of_values: "С таблицей значений"
+  label_with_chart: "С графиком"
+  label_amount_tags: "Теги Сумма"
+  label_amount_entities_with_tags: "Сумма %{name} с тегами"
+  label_quantity: "Количество"

data/config/routes.rb

@@ -9,7 +9,7 @@ Rails.application.routes.draw do
     end
   end
 
-  resources :additional_tags, only: %i[edit update] do
+  resources :additional_tags, only: %i[index edit update] do
     collection do
       post :merge
       get :context_menu, :merge

data/db/migrate/20201123093214_migrate_existing_tags.rb

@@ -14,7 +14,7 @@ class MigrateExistingTags < ActiveRecord::Migration[5.2]
           next if excluded_taggable_types.include? tagging.taggable_type
 
           tag = ActsAsTaggableOn::Tag.create! name: old_tag.name if cnt.zero? && tag.nil?
-          context = tagging.respond_to?('context') && tagging.context.present? ? tagging.context : 'tags'
+          context = tagging.respond_to?(:context) && tagging.context.present? ? tagging.context : 'tags'
 
           # old data can include dups
           next if ActsAsTaggableOn::Tagging.exists? tag_id: tag.id,

data/init.rb

@@ -1,17 +1,21 @@
 # frozen_string_literal: true
 
+require 'additional_tags/plugin_version'
+
+loader = RedminePluginKit::Loader.new plugin_id: 'additional_tags'
+
 Redmine::Plugin.register :additional_tags do
   name        'Additional Tags'
   author      'AlphaNodes GmbH'
   description 'Redmine tagging support'
-  version     AdditionalTags::VERSION
+  version     AdditionalTags::PluginVersion::VERSION
   url         'https://github.com/alphanodes/additional_tags/'
-  author_url 'https://alphanodes.com/'
+  author_url  'https://alphanodes.com/'
   directory __dir__
 
-  requires_redmine version_or_higher: '4.1'
+  requires_redmine version_or_higher: '5.0'
 
-  settings default: Additionals.load_settings('additional_tags'),
+  settings default: loader.default_settings,
            partial: 'additional_tags/settings/settings'
 
   project_module :issue_tracking do
@@ -30,6 +34,4 @@ Redmine::Plugin.register :additional_tags do
        caption: :field_tags
 end
 
-Rails.configuration.to_prepare do
-  AdditionalTags.setup
-end
+RedminePluginKit::Loader.persisting { loader.load_model_hooks! }

data/lib/additional_tags/hooks/model_hook.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module AdditionalTags
+  module Hooks
+    class ModelHook < Redmine::Hook::Listener
+      def after_plugins_loaded(_context = {})
+        AdditionalTags.setup!
+      end
+    end
+  end
+end

data/lib/additional_tags/hooks/view_hook.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+module AdditionalTags
+  module Hooks
+    class ViewHook < Redmine::Hook::ViewListener
+      render_on :view_issues_bulk_edit_details_bottom,
+                partial: 'issues/tags_form_details',
+                locals: { tags_form: 'issues/tags_bulk_edit' }
+      render_on :view_issues_context_menu_end, partial: 'context_menus/issues_tags'
+      render_on :view_issues_form_details_bottom,
+                partial: 'issues/tags_form_details',
+                locals: { tags_form: 'issues/tags_form' }
+      render_on :view_issues_show_details_bottom, partial: 'issues/tags'
+      render_on :view_issues_sidebar_planning_bottom, partial: 'issues/tags_sidebar'
+      render_on :view_layouts_base_html_head, partial: 'additional_tags/html_head'
+      render_on :view_layouts_base_body_bottom, partial: 'additional_tags/body_bottom'
+      render_on :view_wiki_form_bottom, partial: 'tags_form_bottom'
+      render_on :view_wiki_show_bottom, partial: 'tags_show'
+      render_on :view_wiki_show_sidebar_bottom, partial: 'wiki/tags_sidebar'
+
+      def controller_issues_edit_before_save(context = {})
+        tags_journal context[:issue], context[:params]
+      end
+
+      def controller_issues_bulk_edit_before_save(context = {})
+        issue = context[:issue]
+        params = context[:params]
+
+        issues_bulk_tags_fix issue, params
+        tags_journal issue, params
+      end
+
+      # this hook is missing in redmine core at the moment
+      def view_issue_pdf_fields(context = {})
+        issue = context[:issue]
+        right = context[:right]
+
+        if AdditionalTags.setting?(:active_issue_tags) &&
+           User.current.allowed_to?(:view_issue_tags, issue.project)
+          right << [l(:field_tag_list), issue.tag_list]
+        end
+      end
+
+      # this hook is missing in redmine core at the moment
+      def view_wiki_pdf_buttom(context = {})
+        page = context[:page]
+        pdf = context[:pdf]
+
+        return if page.tag_list.blank?
+
+        pdf.ln 5
+        pdf.SetFontStyle 'B', 9
+        pdf.RDMCell 190, 5, l(:field_tag_list), 'B'
+
+        pdf.ln
+        pdf.SetFontStyle '', 8
+        pdf.RDMCell 190, 5, page.tag_list.to_list
+        pdf.ln
+      end
+
+      private
+
+      def issues_bulk_tags_fix(issue, params)
+        return unless params && params[:issue]
+
+        old_tags = issue.tags.map(&:name)
+        new_tags = Array(params[:issue][:tag_list]).reject(&:empty?)
+        issue.tag_list = (old_tags + new_tags).uniq
+      end
+
+      def tags_journal(issue, params)
+        return unless params && params[:issue] && params[:issue][:tag_list]
+
+        issue.tags_to_journal Issue.find_by(id: issue.id)&.tag_list&.to_s,
+                              issue.tag_list.to_s
+      end
+    end
+  end
+end

data/lib/additional_tags/patches/auto_completes_controller_patch.rb

@@ -12,8 +12,7 @@ module AdditionalTags
       module InstanceMethods
         def issue_tags
           suggestion_order = AdditionalTags.setting(:tags_suggestion_order) || 'name'
-          @name = (params[:q] || params[:term]).to_s.strip
-          @tags = Issue.available_tags name_like: @name,
+          @tags = Issue.available_tags name_like: build_search_query_term(params),
                                        sort_by: suggestion_order,
                                        order: (suggestion_order == 'name' ? 'ASC' : 'DESC')
 
@@ -23,17 +22,17 @@ module AdditionalTags
         end
 
         def wiki_tags
-          @name = params[:q].to_s
-          @tags = WikiPage.available_tags project: nil, name_like: @name
+          @tags = WikiPage.available_tags project: nil,
+                                          name_like: build_search_query_term(params)
           render layout: false, partial: 'additional_tag_list', locals: { unsorted: true }
         end
 
         def all_tags
           return render_403 unless User.current.admin?
 
-          @name = params[:q].to_s
+          q = build_search_query_term params
           sql_for_where = "LOWER(#{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.tags_table}.name) LIKE ?"
-          @tags = ActsAsTaggableOn::Tag.where(sql_for_where, "%#{@name.downcase}%")
+          @tags = ActsAsTaggableOn::Tag.where(sql_for_where, "%#{q.downcase}%")
                                        .order(name: :asc)
 
           render layout: false, partial: 'additional_tag_list', locals: { unsorted: true }