additional_tags 1.0.1 → 1.0.4

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,6 @@
+# frozen_string_literal: true
+
+if Rails.version > '6.0'
+  plugin_dir = RedminePluginKit::Loader.plugin_dir plugin_id: 'additional_tags'
+  Rails.autoloaders.main.push_dir "#{plugin_dir}/lib"
+end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Rails.application.routes.draw do
   resources :auto_completes, only: [] do
     collection do

data/db/migrate/20201116145429_acts_as_taggable_migration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ActsAsTaggableMigration < ActiveRecord::Migration[5.2]
   def up
     create_table ActsAsTaggableOn.tags_table do |t|
@@ -30,7 +32,7 @@ class ActsAsTaggableMigration < ActiveRecord::Migration[5.2]
 
     return unless ActsAsTaggableOn::Utils.using_mysql?
 
-    execute("ALTER TABLE #{ActsAsTaggableOn.tags_table} MODIFY name varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;")
+    execute "ALTER TABLE #{ActsAsTaggableOn.tags_table} MODIFY name varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin;"
   end
 
   def down

data/db/migrate/20201123093214_migrate_existing_tags.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MigrateExistingTags < ActiveRecord::Migration[5.2]
   def up
     return unless table_exists?(MigrateTag.table_name) && table_exists?(MigrateTagging.table_name)
@@ -11,8 +13,8 @@ class MigrateExistingTags < ActiveRecord::Migration[5.2]
         old_tag.migrate_taggings.each do |tagging|
           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'
+          tag = ActsAsTaggableOn::Tag.create! name: old_tag.name if cnt.zero? && tag.nil?
+          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,
@@ -28,7 +30,7 @@ class MigrateExistingTags < ActiveRecord::Migration[5.2]
           cnt += 1
         end
 
-        ActsAsTaggableOn::Tag.reset_counters(tag.id, :taggings) unless tag.nil?
+        ActsAsTaggableOn::Tag.reset_counters tag.id, :taggings unless tag.nil?
       end
     end
   end

data/init.rb

@@ -1,15 +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'
 
-  settings default: Additionals.load_settings('additional_tags'),
+  settings default: loader.default_settings,
            partial: 'additional_tags/settings/settings'
 
   project_module :issue_tracking do
@@ -28,6 +34,5 @@ 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! }
+RedminePluginKit::Loader.to_prepare { AdditionalTags.setup!(loader) } if Rails.version < '6.0'

data/lib/additional_tags/hooks/model_hook.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module AdditionalTags
+  module Hooks
+    class ModelHook < Redmine::Hook::Listener
+      def after_plugins_loaded(_context = {})
+        return if Rails.version < '6.0'
+
+        AdditionalTags.setup!
+      end
+    end
+  end
+end

data/lib/additional_tags/hooks/view_hook.rb

@@ -0,0 +1,77 @@
+# 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.join(', ')
+        pdf.ln
+      end
+
+      private
+
+      def issues_bulk_tags_fix(issue, params)
+        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/agile_boards_controller_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module AgileBoardsControllerPatch

data/lib/additional_tags/patches/agile_query_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module AgileQueryPatch
@@ -10,19 +12,19 @@ module AdditionalTags
         alias_method :initialize_available_filters_without_tags, :initialize_available_filters
         alias_method :initialize_available_filters, :initialize_available_filters_with_tags
 
-        add_available_column QueryColumn.new(:tags)
+        add_available_column ::QueryTagsColumn.new
       end
 
       module InstanceMethods
         def sql_for_tags_field(_field, operator, value)
-          case operator
-          when '=', '!'
-            issues = Issue.tagged_with(value.clone, any: true)
-          when '!*'
-            issues = Issue.joins(:tags).uniq
-          else
-            issues = Issue.tagged_with(ActsAsTaggableOn::Tag.all.map(&:to_s), any: true)
-          end
+          issues = case operator
+                   when '=', '!'
+                     Issue.tagged_with value.clone, any: true
+                   when '!*'
+                     Issue.joins(:tags).uniq
+                   else
+                     Issue.tagged_with(ActsAsTaggableOn::Tag.all.map(&:to_s), any: true)
+                   end
 
           compare   = operator.include?('!') ? 'NOT IN' : 'IN'
           ids_list  = issues.collect(&:id).push(0).join(',')

data/lib/additional_tags/patches/agile_versions_controller_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module AgileVersionsControllerPatch

data/lib/additional_tags/patches/agile_versions_query_patch.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module AgileVersionsQueryPatch
       extend ActiveSupport::Concern
 
       included do
-        add_available_column QueryColumn.new(:tags)
+        add_available_column ::QueryTagsColumn.new
       end
     end
   end

data/lib/additional_tags/patches/auto_completes_controller_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module AutoCompletesControllerPatch
@@ -10,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')
 
@@ -21,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
-          sql_for_where = "LOWER(#{ActiveRecord::Base.connection.quote_table_name(ActsAsTaggableOn.tags_table)}.name) LIKE ?"
-          @tags = ActsAsTaggableOn::Tag.where(sql_for_where, "%#{@name.downcase}%")
+          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, "%#{q.downcase}%")
                                        .order(name: :asc)
 
           render layout: false, partial: 'additional_tag_list', locals: { unsorted: true }

data/lib/additional_tags/patches/calendars_controller_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module CalendarsControllerPatch

data/lib/additional_tags/patches/dashboard_async_blocks_controller_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module DashboardAsyncBlocksControllerPatch

data/lib/additional_tags/patches/dashboard_content_patch.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module AdditionalTags
+  module Patches
+    module DashboardContentPatch
+      extend ActiveSupport::Concern
+
+      included do
+        prepend InstanceOverwriteMethods
+      end
+
+      module InstanceOverwriteMethods
+        def block_definitions
+          blocks = super
+
+          blocks['issue_tags'] = {
+            label: l(:field_issue_tags),
+            permission: :view_issue_tags,
+            if: proc { AdditionalTags.setting?(:active_issue_tags) },
+            async: { partial: 'dashboards/blocks/issue_tags' }
+          }
+
+          blocks
+        end
+      end
+    end
+  end
+end

data/lib/additional_tags/patches/dashboards_controller_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module DashboardsControllerPatch

data/lib/additional_tags/patches/gantts_controller_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module GanttsControllerPatch

data/lib/additional_tags/patches/imports_controller_patch.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AdditionalTags
   module Patches
     module ImportsControllerPatch