additional_tags 3.1.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30f90dcfc93dd66550bb8087b9f3a94fa411484f4876ccb9d837548edf0b64ae
-  data.tar.gz: df63312af11e2ce492b5b36bb3b0b1ce9f3e0b28c7d901512301226e06dcd65b
+  metadata.gz: 941c8111797b91a7678dc2a387b792699a95f98e129c34348974980171c8913d
+  data.tar.gz: 88af7551ac94803ed51804a266606125fc9fd870922426718560b23546e9477b
 SHA512:
-  metadata.gz: 40e8517cddee11354aa8979506352abdbbb4e10774ce74f7f3d5c637b7bb2c03fd1fc75bd0e51f39ea23525aa8da2a54cb8089e3738b49d42718e5ea54031657
-  data.tar.gz: 429ea55984a5c3225db53f9a5699bf897a54ae09f9c4bf76fb24b5358702a6bb7547c9efba57938bfeb3c6e3b877f3ce7bffafef7069f645914d6b9b38f8f4a9
+  metadata.gz: 2bcad3378a0309df1df4a967a6e6877959310c8d6577470f504ad8d3f66257531a1d78166284b46a6d9769928f23464fd60d7777e24fe87b3b324a45dc5ec382
+  data.tar.gz: 01a32c8d39b97fbaa2d4fbfc01b00441e1bfda74eaa552e2eebbbe869637d97bfb5ec04138f1a3b86d236b35dc509d4ef92b88a5bfc5c841b6419289e41fe54f

data/README.md

@@ -5,11 +5,11 @@
 ## Features
 
 - Tags for issues. To use them you need to:
-  -  *Activate issue tags* in the plugin configuration
-  -  and update your role permissions in the Redmine administration *Roles & permissions / Issue tracking*.
+  - *Activate issue tags* in the plugin configuration
+  - and update your role permissions in the Redmine administration *Roles & permissions / Issue tracking*.
 - Tags for wiki pages. To use them  you need to:
   - *Activate wiki tags* in the plugin configuration
-  -  and update your role permissions in the Redmine administration *Roles & permissions / Wiki*
+  - and update your role permissions in the Redmine administration *Roles & permissions / Wiki*
 - Available role permissions for issue tags (section *Issue tracking*):
   - Add issue tags
   - Edit issue tags
@@ -59,7 +59,7 @@ Start using it, too. The example image shows the centralized tag management in t
 ## Requirements
 
 - Redmine `>= 5.0`
-- Ruby `>= 3.0`
+- Ruby `>= 3.1`
 - Redmine plugins: [additionals](https://www.redmine.org/plugins/additionals)
 
 ## Installing
@@ -94,6 +94,7 @@ git clone https://github.com/alphanodes/additional_tags.git plugins/additional_t
 ### 2. Install dependencies and migrate database
 
 ```shell
+bundle config set --local without 'development test'
 bundle install
 bundle exec rake redmine:plugins:migrate RAILS_ENV=production
 ```
@@ -136,13 +137,39 @@ rm -rf plugins/additional_tags
 ## License
 
 This plugin is licensed under the terms of GNU/GPL v2.
-See LICENSE for details.
+See [LICENSE](LICENSE) for details.
+
+## Redmine Copyright
+
+The additional_tags is a plugin extension for Redmine Project Management Software, whose Copyright follows.
+Copyright (C) 2006-  Jean-Philippe Lang
+
+Redmine is a flexible project management web application written using Ruby on Rails framework.
+More details can be found in the doc directory or on the official website <http://www.redmine.org>
+
+This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 ## Credits
 
+### Code
+
 The source code is a (almost) rewrite of
 
 - [redmine_tags](https://github.com/ixti/redmine_tags)
 - [redmineup_tags](https://www.redmine.org/plugins/redmineup_tags)
 
 Special thanks to the original author and contributors for making this awesome hook for Redmine.
+
+### Icons
+
+Thanks to:
+
+- Font Awesome Free Icons (<https://fontawesome.com/license/free>) licenced under - Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License.
+  Copyright (c) 2018- Fonticons, Inc.
+- Tabler Icons - Free and open source icons (<https://tabler.io/icons>) licensed under MIT License.
+  Copyright (c) 2020- Paweł Kuna

data/app/controllers/additional_tags_controller.rb

@@ -36,7 +36,7 @@ class AdditionalTagsController < ApplicationController
   def update
     @tag.name = params[:tag][:name] if params[:tag]
     if @tag.save
-      flash[:notice] = l :notice_successful_update
+      flash[:notice] = flash_msg :update
       respond_to do |format|
         format.html do
           redirect_to @tag_list_path

data/app/helpers/additional_tags_helper.rb

@@ -32,14 +32,14 @@ module AdditionalTagsHelper
                          counts: WikiPage.available_tags.to_h { |tag| [tag.id, tag.count] } }
     end
 
-    call_hook :helper_additional_manageable_tag_columns, columns: columns
+    call_hook(:helper_additional_manageable_tag_columns, columns:)
 
     @manageable_tag_columns = columns
   end
 
   def manageable_tag_column_values(tag)
     columns = []
-    manageable_tag_columns.each do |_column, column_values|
+    manageable_tag_columns.each_value do |column_values|
       cnt = column_values[:counts][tag.id]
       cnt = 0 if cnt.blank?
 
@@ -52,6 +52,10 @@ module AdditionalTagsHelper
     columns
   end
 
+  def values_for_sort_direction
+    [[l(:label_ascending), 'asc'], [l(:label_descending), 'desc']]
+  end
+
   def sort_tags_for_list(tags, sort_by: nil, sort_order: nil)
     return tags if tags.size < 2
 
@@ -123,9 +127,9 @@ module AdditionalTagsHelper
     use_colors = AdditionalTags.use_colors? if use_colors.nil?
     color_theme = AdditionalTags.setting :tags_color_theme if color_theme.nil?
 
-    tag_info = AdditionalTag.new name: name.nil? ? tag_object.name : name,
+    tag_info = AdditionalTag.new(name: name.nil? ? tag_object.name : name,
                                  disable_grouping: !use_colors,
-                                 color_theme: color_theme
+                                 color_theme:)
     tag_name = [tag_info.tag_name]
 
     tag_style = "background-color: #{tag_info.tag_bg_color}; color: #{tag_info.tag_fg_color}" if use_colors
@@ -202,7 +206,7 @@ module AdditionalTagsHelper
     sum = if entries.blank? || entries.empty?
             0
           else
-            query = IssueQuery.new project: project, name: '_'
+            query = IssueQuery.new project:, name: '_'
             query.add_filter 'tags', '*'
             query.filters['status_id'][:operator] = '*' if !open_issues_only && query.filters.key?('status_id')
 
@@ -217,36 +221,44 @@ module AdditionalTagsHelper
 
   def issue_tag_status_filter(operator: nil, open_issues_only: false)
     if operator
-      { field: :status_id, operator: operator }
+      { field: :status_id, operator: }
     elsif open_issues_only
       { field: :status_id, operator: 'o' }
     end
   end
 
+  def wiki_tags_on_show?
+    options = { enabled: AdditionalTags.setting?(:active_wiki_tags) }
+
+    call_hook(:helper_wiki_tags_on_show, options:)
+
+    options[:enabled]
+  end
+
   private
 
   def tag_url(tag_name, filter: nil, tag_action: nil, tag_controller: nil, project: nil, display_type: nil)
     action = tag_action.presence || (controller_name == 'hrm_user_resources' ? 'show' : 'index')
 
-    fields = [:tags]
-    values = { tags: [tag_name] }
-    operators = { tags: '=' }
+    f = [:tags]
+    v = { tags: [tag_name] }
+    op = { tags: '=' }
 
     if filter.present?
       field = filter[:field]
-      fields << field
-      operators[field] = filter[:operator]
-      values[field] = filter[:value] if filter.key? :value
+      f << field
+      op[field] = filter[:operator]
+      v[field] = filter[:value] if filter.key? :value
     end
 
     { controller: tag_controller.presence || controller_name,
-      action: action,
+      action:,
       set_filter: 1,
-      display_type: display_type,
+      display_type:,
       project_id: project,
-      f: fields,
-      v: values,
-      op: operators }
+      f:,
+      v:,
+      op: }
   end
 
   def add_tags(style, tags, content, item_el, options)

data/app/helpers/additional_tags_wiki_helper.rb

@@ -16,26 +16,24 @@ module AdditionalTagsWikiHelper
     render_tags_list sidebar_tags, **options
   end
 
-  def render_wiki_index_title(project: nil, name: nil, tag: nil, title: :label_wiki)
+  def render_wiki_index_title(title, project: nil, name: nil, tag: nil)
+    title = l title unless is_a? Symbol
+
     if tag.present?
       tag_object = ActsAsTaggableOn::Tag.new name: tag
 
       if project
         safe_join [l(:label_wiki_index_for_tag), additional_tag_link(tag_object, link: '#')], ' '
       else
-        title = [link_to(l(title), wiki_index_path)]
-        title << Additionals::LIST_SEPARATOR
-        title << l(:label_wiki_index_for_tag)
-        title << additional_tag_link(tag_object, link: '#')
-        safe_join title, ' '
+        items = [link_to(title, wiki_index_path)]
+        items << safe_join([l(:label_wiki_index_for_tag), additional_tag_link(tag_object, link: '#')], ' ')
+        render_breadcrumb items
       end
     elsif name.present?
-      title = [link_to(l(title), wiki_index_path)]
-      title << Additionals::LIST_SEPARATOR
-      title << name
-      safe_join title, ' '
+      render_breadcrumb [link_to(title, wiki_index_path),
+                         name]
     else
-      l title
+      title
     end
   end
 end

data/app/models/migrate_tag.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class MigrateTag < ActiveRecord::Base
+class MigrateTag < AdditionalsApplicationRecord
   self.table_name = 'tags'
   has_many :migrate_taggings, dependent: :destroy, foreign_key: :tag_id, inverse_of: :migrate_tag
 end

data/app/models/migrate_tagging.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class MigrateTagging < ActiveRecord::Base
+class MigrateTagging < AdditionalsApplicationRecord
   self.table_name = 'taggings'
   belongs_to :migrate_tag, foreign_key: :tag_id, inverse_of: :migrate_taggings
   belongs_to :taggable, polymorphic: true

data/app/models/query_tags_column.rb

@@ -2,6 +2,6 @@
 
 class QueryTagsColumn < QueryRelationsColumn
   def initialize(name = :tags, **options)
-    super name, **options
+    super
   end
 end

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

@@ -15,8 +15,7 @@ fieldset.settings
                                                      @settings[:tags_sort_by])
     '
     = select_tag 'settings[tags_sort_order]',
-                 options_for_select([[l(:label_ascending), 'asc'], [l(:label_descending), 'desc']],
-                                    @settings[:tags_sort_order])
+                 options_for_select(values_for_sort_direction, @settings[:tags_sort_order])
 
   p
     = additionals_settings_select :tags_suggestion_order,
@@ -31,6 +30,9 @@ fieldset.settings
                                                                          [l(:label_tag_color_theme, value: 5), 'd']],
                                                                         @settings['tags_color_theme'])
 
+  p
+    = additionals_settings_checkbox :show_tags_after_queries
+
 fieldset.settings
   legend = l :label_issue_plural
 

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

@@ -6,10 +6,10 @@
         tr
           th.checkbox.hide-when-print
             = check_box_tag 'ids[]', '', false, class: 'toggle-selection',
-                            title: "#{l :button_check_all}/#{l :button_uncheck_all}"
+                            title: "#{l :button_check_all} / #{l :button_uncheck_all}"
 
           th = l :field_name
-          - manageable_tag_columns.each do |_column, column_values|
+          - manageable_tag_columns.each_value do |column_values|
             th = column_values[:label]
           th
       tbody
@@ -20,10 +20,10 @@
             td.checkbox.hide-when-print
               = check_box_tag 'ids[]', tag.id, false, id: nil
             td
-              = additional_tag_link tag,
+              = additional_tag_link(tag,
                                     link: edit_additional_tag_path(tag),
-                                    use_colors: use_colors,
-                                    color_theme: color_theme
+                                    use_colors:,
+                                    color_theme:)
 
             - manageable_tag_column_values(tag).each do |column|
               td = column

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

@@ -1,4 +1,4 @@
-ul.reporting-list.tag-summary
+ul.dashboard-list.tag-summary
   li.amount-tags
     = l :label_amount_tags
     ' :

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

@@ -1,18 +1,18 @@
 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,
+- tags = Issue.available_tags(project: @project, open_issues_only:)
+- counts = AdditionalTags::Tags.entity_group_by(scope: Issue.group_by_status_with_tags(@project),
+                                                tags:,
                                                 statuses: { true => :closed, false => :open },
-                                                group_id_is_bool: true
+                                                group_id_is_bool: true)
 
 = render 'common/tag_summary_block',
-         tags: 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)
+                                                open_issues_only:)
 
 - if RedminePluginKit.true? settings[:with_table_of_values]
   - if tags.present?
@@ -31,30 +31,30 @@ h3 = block_definition[:label]
         - color_theme = AdditionalTags.setting :tags_color_theme
         - tags.each do |tag|
           tr
-            td.name = additional_tag_link tag,
+            td.name = additional_tag_link(tag,
                                           tag_action: 'index',
                                           tag_controller: 'issues',
-                                          filter: issue_tag_status_filter(open_issues_only: open_issues_only),
+                                          filter: issue_tag_status_filter(open_issues_only:),
                                           use_colors: RedminePluginKit.true?(settings[:use_colors]),
-                                          color_theme: color_theme
+                                          color_theme:)
             - unless open_issues_only
-              td.value = additional_tag_link tag,
+              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,
+                                             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,
+                                             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),
+                                           filter: issue_tag_status_filter(open_issues_only:),
                                            use_colors: false,
-                                           name: open_issues_only ? counts[tag.name][:open] : counts[tag.name][:total]
+                                           name: open_issues_only ? counts[tag.name][:open] : counts[tag.name][:total])
   - else
     p.nodata = l :label_no_data

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

@@ -3,4 +3,4 @@
   div
     p#issue_tags
       = label_tag l(:field_tag_list)
-      = render tags_form, project: project
+      = render tags_form, project:

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

@@ -0,0 +1,2 @@
+- if AdditionalTags.setting? :show_tags_after_queries
+  = render 'issues/tags_sidebar'

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

@@ -0,0 +1,2 @@
+- unless AdditionalTags.setting? :show_tags_after_queries
+  = render 'issues/tags_sidebar'

data/app/views/wiki/_tags_form_bottom.html.slim

@@ -1,4 +1,4 @@
 - if AdditionalTags.setting?(:active_wiki_tags) && User.current.allowed_to?(:add_wiki_tags, @project)
   p#wiki_tags
     = label_tag l(:field_tag_list)
-    = render 'wiki/tags_form', project: project, page: page
+    = render 'wiki/tags_form', project:, page:

data/app/views/wiki/_tags_show.html.slim

@@ -1,4 +1,4 @@
-- if AdditionalTags.setting? :active_wiki_tags
+- if wiki_tags_on_show?
   .wiki-attributes
     = render 'additional_tags/tag_list',
              entry: page,

data/app/views/wiki/tag_index.html.slim

@@ -2,7 +2,7 @@
   - if User.current.allowed_to? :edit_wiki_pages, @project
     = link_to l(:label_wiki_page_new), new_project_wiki_page_path(@project), remote: true, class: 'icon icon-add'
 
-h2 = render_wiki_index_title project: @project, tag: @tag
+h2 = render_wiki_index_title :label_wiki, project: @project, tag: @tag
 
 - if @pages.empty?
   p.nodata = l :label_no_data

data/config/locales/bg.yml

@@ -15,6 +15,7 @@ bg:
   label_manage_tags: "Управление на маркерите"
   label_merge_selected_tags: "Обединение на избраните маркери"
   label_open_issues_only: "Показване само на отворените задачи"
+  label_show_tags_after_queries: "Показване на етикети след заявки"
   label_show_with_count: "Показване на брой маркирани обекти"
   label_tag_color_theme: "Тема на цвета %{value}"
   label_tags_color_theme: "Цвят"

data/config/locales/cs.yml

@@ -15,6 +15,7 @@ cs:
   label_manage_tags: "Spravovat štítky"
   label_merge_selected_tags: "Sloučit vybrané značky"
   label_open_issues_only: "Zobrazit pouze otevřené problémy"
+  label_show_tags_after_queries: "Zobrazit TAGy po dotazech"
   label_show_with_count: "Zobrazit částku na značce"
   label_tag_color_theme: "Barevné téma %{value}"
   label_tags_color_theme: "Barva"

data/config/locales/de.yml

@@ -15,6 +15,7 @@ de:
   label_manage_tags: TAGs verwalten
   label_merge_selected_tags: Ausgewählte TAGs zusammenführen
   label_open_issues_only: Zeige nur offene Tickets
+  label_show_tags_after_queries: "Zeige TAGs nach Abfragen"
   label_show_with_count: Zeige Anzahl zu TAG
   label_tag_color_theme: Farbschema %{value}
   label_tags_color_theme: Farbe

data/config/locales/en.yml

@@ -15,6 +15,7 @@ en:
   label_manage_tags: "Manage tags"
   label_merge_selected_tags: "Merge selected tags"
   label_open_issues_only: "Display open issues only"
+  label_show_tags_after_queries: "Show tags after queries"
   label_show_with_count: "Display amount on tag"
   label_tag_color_theme: Color theme %{value}
   label_tags_color_theme: Color

data/config/locales/es.yml

@@ -15,6 +15,7 @@ es:
   label_manage_tags: "Manejar  tags"
   label_merge_selected_tags: "Fusionar tags seleccionadas"
   label_open_issues_only: "Mostrar sólo las peticiones abiertas"
+  label_show_tags_after_queries: "Mostrar TAGs tras las consultas"
   label_show_with_count: "Mostrar la cantidad en la tags"
   label_tag_color_theme: "Tema del color %{value}"
   label_tags_colors: "Color"

data/config/locales/fa.yml

@@ -0,0 +1,45 @@
+fa:
+  activerecord:
+    errors:
+      messages:
+        invalid_mutually_exclusive_tags: از تگ های منحصر به فرد متقابل استفاده شده است
+  field_issue_tags: تگ‌های مسئله
+  field_tag_list: تگ‌ها
+  field_tags: تگ‌ها
+  label_active_issue_tags: "تگ‌های فعال مسئله"
+  label_active_wiki_tags: "تگ‌های فعال ویکی"
+  label_add_tags: "افزودن تگ"
+  label_amount_entities_with_tags: "مقدار %{name} با تگ‌ها"
+  label_amount_tags: "تگ‌های مقدار"
+  label_edit_tags: "ویرایش تگ‌ها"
+  label_manage_tags: "مدیریت تگ‌ها"
+  label_merge_selected_tags: "ادغام تگ‌های انتخابی"
+  label_open_issues_only: "مشاهده مسائل باز"
+  label_show_tags_after_queries: "Show tags after queries"
+  label_show_with_count: "نمایش مقدار روی تگ"
+  label_tag_color_theme: تم رنگی %{value}
+  label_tags_color_theme: رنگ
+  label_tags_sidebar: "نمایش تگ‌ها در حاشیه به عنوان"
+  label_tags_sort_by: "مرتب سازی تگ‌ها بر اساس"
+  label_tags_suggestion_order: "سفارش پیشنهاد"
+  label_tags_tag: "تگ"
+  label_tags_without_color: بدون رنگ
+  label_use_colors: استفاده از رنگ‌ها
+  label_wiki_index_for_tag: "صفحه‌های ویکی با تگ"
+  label_with_chart: "با نمودار"
+  label_with_table_of_values: "با جدول مقادیر"
+  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_count: "بیشتر استفاده‌شده"
+  tags_order_by_last_created: "آخرین ساخته‌شده"
+  tags_order_by_name: "نام"
+  tags_sidebar_cloud: "ابر"
+  tags_sidebar_list: "لیست"
+  tags_sidebar_none: "هیچکدام"
+  tags_sidebar_simple_cloud: "ابر ساده"
+  tags_sort_by_count: "تعداد"
+  tags_sort_by_name: "نام"

data/config/locales/fr.yml

@@ -15,6 +15,7 @@ fr:
   label_manage_tags: "Gérer les tags"
   label_merge_selected_tags: "Fusionner les tags sélectionnées"
   label_open_issues_only: "Afficher uniquement les demandes ouverts"
+  label_show_tags_after_queries: "Afficher les TAG après les requêtes"
   label_show_with_count: "Afficher le montant sur l'tags"
   label_tag_color_theme: "Thème de la couleur %{value}"
   label_tags_colors: "Couleur"

data/config/locales/it.yml

@@ -15,6 +15,7 @@ it:
   label_manage_tags: "Gestire i tag"
   label_merge_selected_tags: "Unisci i tag selezionati"
   label_open_issues_only: "Mostra solo i segnalazione"
+  label_show_tags_after_queries: "Mostra i TAG dopo le query"
   label_show_with_count: "Visualizzare l'importo sul tag"
   label_tag_color_theme: "Tema colore %{value}"
   label_tags_colors: Colore

data/config/locales/ja.yml

@@ -15,6 +15,7 @@ ja:
   label_manage_tags: "タグの管理"
   label_merge_selected_tags: "選択したタグをマージ"
   label_open_issues_only: "開いている問題のみを表示"
+  label_show_tags_after_queries: "クエリーの後にTAGを表示する"
   label_show_with_count: "タグに金額を表示"
   label_tag_color_theme: "カラーテーマ%{value}"
   label_tags_colors: "カラー"

data/config/locales/ko.yml

@@ -15,6 +15,7 @@ ko:
   label_manage_tags: "태그 관리"
   label_merge_selected_tags: "선택한 태그 병합"
   label_open_issues_only: "미해결 문제 만 표시"
+  label_show_tags_after_queries: "쿼리 뒤에 태그 표시"
   label_show_with_count: "태그에 금액 표시"
   label_tag_color_theme: "색상 테마 %{value}"
   label_tags_colors: "색깔"

data/config/locales/pl.yml

@@ -15,6 +15,7 @@ pl:
   label_manage_tags: "Zarządzaj tagami"
   label_merge_selected_tags: "Łączenie wybranych tagów"
   label_open_issues_only: "Wyświetlaj tylko sprawy otwarte"
+  label_show_tags_after_queries: "Pokaż TAGi po zapytaniach"
   label_show_with_count: "Wyświetlanie ilości na etykiecie"
   label_tag_color_theme: "Kolorowy motyw %{value}"
   label_tags_colors: Kolor

data/config/locales/pt-BR.yml

@@ -15,6 +15,7 @@ pt-BR:
   label_manage_tags: "Gerenciar etiquetas"
   label_merge_selected_tags: "Fundir tags selecionadas"
   label_open_issues_only: "Exibir apenas questões em aberto"
+  label_show_tags_after_queries: "Mostrar TAGs após consultas"
   label_show_with_count: "Mostrar quantidade na etiqueta"
   label_tag_color_theme: "Tema da cor %{value}"
   label_tags_colors: "Cor"

data/config/locales/ru.yml

@@ -15,6 +15,7 @@ ru:
   label_manage_tags: "Управление метками"
   label_merge_selected_tags: "Объединить выбранные метки"
   label_open_issues_only: "Отображать только открытые задачи"
+  label_show_tags_after_queries: "Показывать теги после запросов"
   label_show_with_count: "Отображать количество на метке"
   label_tag_color_theme: "Цветовая тема %{value}"
   label_tags_colors: "Цвет"

data/config/settings.yml

@@ -1,6 +1,7 @@
 active_issue_tags: '0'
 active_wiki_tags: '0'
 open_issues_only: '0'
+show_tags_after_queries: '0'
 show_with_count: '0'
 tags_color_theme: '1'
 tags_sidebar: 'none'

data/db/migrate/20201123093214_migrate_existing_tags.rb

@@ -17,16 +17,16 @@ class MigrateExistingTags < ActiveRecord::Migration[5.2]
           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,
+          next if ActsAsTaggableOn::Tagging.exists?(tag_id: tag.id,
                                                     taggable_id: tagging.taggable_id,
                                                     taggable_type: tagging.taggable_type,
-                                                    context: context
+                                                    context:)
 
-          ActsAsTaggableOn::Tagging.create! tag_id: tag.id,
+          ActsAsTaggableOn::Tagging.create!(tag_id: tag.id,
                                             taggable_id: tagging.taggable_id,
                                             taggable_type: tagging.taggable_type,
-                                            context: context,
-                                            created_at: tagging.created_at
+                                            context:,
+                                            created_at: tagging.created_at)
           cnt += 1
         end
 

data/init.rb

@@ -5,13 +5,13 @@ 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'
+  name 'Additional Tags'
+  author 'AlphaNodes GmbH'
   description 'Redmine tagging support'
-  version     AdditionalTags::PluginVersion::VERSION
-  url         'https://github.com/alphanodes/additional_tags/'
-  author_url  'https://alphanodes.com/'
-  directory __dir__
+  version AdditionalTags::PluginVersion::VERSION
+  url 'https://github.com/alphanodes/additional_tags/'
+  author_url 'https://alphanodes.com/'
+  directory File.dirname(__FILE__)
 
   requires_redmine version_or_higher: '5.0'
 

data/lib/additional_tags/hooks/view_hook.rb

@@ -11,7 +11,8 @@ module AdditionalTags
                 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_issues_sidebar_planning_bottom, partial: 'issues/tags_sidebar_before'
+      render_on :view_issues_sidebar_queries_bottom, partial: 'issues/tags_sidebar_after'
       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'

data/lib/additional_tags/patches/agile_query_patch.rb

@@ -6,7 +6,7 @@ module AdditionalTags
       extend ActiveSupport::Concern
 
       included do
-        include AdditionalsQuery
+        include Additionals::Concerns::Query
         include InstanceMethods
 
         alias_method :initialize_available_filters_without_tags, :initialize_available_filters

data/lib/additional_tags/patches/issue_patch.rb

@@ -35,7 +35,7 @@ module AdditionalTags
           scope = if project && Setting.display_subprojects_issues?
                     visible(user).where(AdditionalTags::Tags.subproject_sql(project))
                   else
-                    visible user, project: project
+                    visible user, project:
                   end
 
           scope.joins(:status)

data/lib/additional_tags/patches/issue_query_patch.rb

@@ -6,7 +6,7 @@ module AdditionalTags
       extend ActiveSupport::Concern
 
       included do
-        include AdditionalsQuery
+        include Additionals::Concerns::Query
         prepend InstanceOverwriteMethods
         include InstanceMethods
 
@@ -36,13 +36,14 @@ module AdditionalTags
         def sql_for_tags_field(field, _operator, values)
           build_sql_for_tags_field_with_permission klass: queried_class,
                                                    operator: operator_for(field),
-                                                   values: values,
+                                                   values:,
                                                    permission: :view_issue_tags
         end
       end
 
       module InstanceMethods
-        def issues_with_tags(**options)
+        def issues_with_tags(options = nil)
+          options ||= {}
           issues = issues_without_tags(**options)
           return issues unless has_column? :tags
 

data/lib/additional_tags/patches/query_patch.rb

@@ -13,12 +13,11 @@ module AdditionalTags
         def sql_for_tags_field(field, _operator, values)
           build_sql_for_tags_field klass: queried_class,
                                    operator: operator_for(field),
-                                   values: values
+                                   values:
         end
 
-        def initialize_tags_filter(position: nil)
-          add_available_filter 'tags', order: position,
-                                       type: :list_optional,
+        def initialize_tags_filter
+          add_available_filter 'tags', type: :list_optional,
                                        values: -> { available_tag_values queried_class }
         end
 
@@ -32,7 +31,7 @@ module AdditionalTags
         end
 
         def available_tag_values(klass)
-          klass.available_tags(project: project)
+          klass.available_tags(project:)
                .pluck(:name)
                .map { |name| [name, name] }
         end
@@ -69,7 +68,7 @@ module AdditionalTags
           when '=', '!'
             ids_list = klass.tagged_with(values, any: true).ids
             # special case: filter with deleted tag
-            return AdditionalsQuery::NO_RESULT_CONDITION if ids_list.blank? && values.present? && operator == '='
+            return Additionals::SQL_NO_RESULT_CONDITION if ids_list.blank? && values.present? && operator == '='
           else
             allowed_projects = Project.where(Project.allowed_to_condition(User.current, permission))
                                       .select(:id)
@@ -90,7 +89,7 @@ module AdditionalTags
               "(#{klass.table_name}.id #{compare} (#{ids_list.join ','}))"
             elsif values.present? && operator == '='
               # special case: filter with deleted tag
-              AdditionalsQuery::NO_RESULT_CONDITION
+              Additionals::SQL_NO_RESULT_CONDITION
             end
           else
             entries = ActsAsTaggableOn::Tagging.where taggable_type: klass.name

data/lib/additional_tags/patches/time_entry_query_patch.rb

@@ -36,7 +36,7 @@ module AdditionalTags
         end
 
         def sql_for_issue_tags_field(_field, operator, values)
-          build_sql_for_tags_field klass: Issue, operator: operator, values: values
+          build_sql_for_tags_field klass: Issue, operator:, values:
         end
       end
     end

data/lib/additional_tags/patches/wiki_controller_patch.rb

@@ -20,7 +20,7 @@ module AdditionalTags
           @page.safe_attributes = [:tag_list]
           @page.tag_list = params[:wiki_page][:tag_list].to_a.reject(&:empty?)
           flash[:notice] = if @page.save
-                             l :notice_successful_update
+                             flash_msg :update
                            else
                              t :notice_failed_to_add_tags
                            end

data/lib/additional_tags/patches/wiki_page_patch.rb

@@ -45,7 +45,7 @@ module AdditionalTags
         def with_tags(tag, project: nil, order: 'title_asc', max_entries: nil, exclude_page: nil)
           wiki = project&.wiki
 
-          scope = with_tags_scope wiki: wiki, project: project
+          scope = with_tags_scope(wiki:, project:)
           scope = scope.where.not id: exclude_page.id if exclude_page
           scope = scope.limit max_entries if max_entries
 

data/lib/additional_tags/plugin_version.rb

@@ -2,6 +2,6 @@
 
 module AdditionalTags
   module PluginVersion
-    VERSION = '3.1.0' unless defined? AdditionalTags::PluginVersion::VERSION
+    VERSION = '3.3.1' unless defined? AdditionalTags::PluginVersion::VERSION
   end
 end

data/lib/additional_tags/tags.rb

@@ -7,7 +7,7 @@ module AdditionalTags
         permission = options[:permission] || :view_issue_tags
         skip_pre_condition = options[:skip_pre_condition] || true
 
-        tag_access permission, user, skip_pre_condition: skip_pre_condition
+        tag_access permission, user, skip_pre_condition:
       end
 
       def available_tags(klass, **options)
@@ -48,7 +48,7 @@ module AdditionalTags
       end
 
       def all_type_tags(klass, without_projects: false)
-        ActsAsTaggableOn::Tag.joins(tag_for_joins(klass, without_projects: without_projects))
+        ActsAsTaggableOn::Tag.joins(tag_for_joins(klass, without_projects:))
                              .distinct
                              .order(:name)
       end
@@ -74,7 +74,8 @@ module AdditionalTags
         ActsAsTaggableOn::Tagging.transaction do
           tag = ActsAsTaggableOn::Tag.find_by(name: tag_name) || ActsAsTaggableOn::Tag.create(name: tag_name)
           # Update old tagging with new tag
-          ActsAsTaggableOn::Tagging.where(tag_id: tags_to_merge.map(&:id)).update_all tag_id: tag.id
+          ActsAsTaggableOn::Tagging.where(tag_id: tags_to_merge.map(&:id))
+                                   .update_all tag_id: tag.id
           # remove old (merged) tags
           tags_to_merge.reject { |t| t.id == tag.id }.each(&:destroy)
           # remove duplicate taggings
@@ -114,22 +115,22 @@ module AdditionalTags
       def entity_group_by(scope:, tags:, statuses: nil, sub_groups: nil, group_id_is_bool: false)
         counts = {}
         tags.each do |tag|
-          values = { tag: tag, total: 0, total_sub_groups: 0, groups: [] }
+          values = { tag:, total: 0, total_sub_groups: 0, groups: [] }
 
           if statuses
             statuses.each do |status|
               group_id = status.first
               group = status.second
-              values[group] = status_for_tag_value scope: scope,
+              values[group] = status_for_tag_value(scope:,
                                                    tag_id: tag.id,
-                                                   group_id: group_id,
-                                                   group_id_is_bool: group_id_is_bool
-              values[:groups] << { id: group_id, group: group, count: values[group] }
+                                                   group_id:,
+                                                   group_id_is_bool:)
+              values[:groups] << { id: group_id, group:, count: values[group] }
               values[:total] += values[group]
               values[:total_sub_groups] += values[group] if sub_groups&.include? group_id
             end
           else
-            values[:total] += status_for_tag_value scope: scope, tag_id: tag.id
+            values[:total] += status_for_tag_value scope:, tag_id: tag.id
           end
 
           values[:total_without_sub_groups] = values[:total] - values[:total_sub_groups]
@@ -210,13 +211,13 @@ module AdditionalTags
         projects_allowed = if permission.nil?
                              Project.visible.ids
                            else
-                             Project.where(Project.allowed_to_condition(user, permission, skip_pre_condition: skip_pre_condition)).ids
+                             Project.where(Project.allowed_to_condition(user, permission, skip_pre_condition:)).ids
                            end
 
         if projects_allowed.present?
           "#{Project.table_name}.id IN (#{projects_allowed.join ','})" unless projects_allowed.empty?
         else
-          AdditionalsQuery::NO_RESULT_CONDITION
+          Additionals::SQL_NO_RESULT_CONDITION
         end
       end
     end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: additional_tags
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.3.1
 platform: ruby
 authors:
 - AlphaNodes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-01 00:00:00.000000000 Z
+date: 2024-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redmine_plugin_kit
   requirement: !ruby/object:Gem::Requirement
@@ -79,6 +79,8 @@ files:
 - app/views/issues/_tags_form.html.slim
 - app/views/issues/_tags_form_details.html.slim
 - app/views/issues/_tags_sidebar.html.slim
+- app/views/issues/_tags_sidebar_after.html.slim
+- app/views/issues/_tags_sidebar_before.html.slim
 - app/views/wiki/_tags_form.html.slim
 - app/views/wiki/_tags_form_bottom.html.slim
 - app/views/wiki/_tags_show.html.slim
@@ -92,6 +94,7 @@ files:
 - config/locales/de.yml
 - config/locales/en.yml
 - config/locales/es.yml
+- config/locales/fa.yml
 - config/locales/fr.yml
 - config/locales/it.yml
 - config/locales/ja.yml
@@ -148,14 +151,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '3.0'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Redmine plugin for adding tag functionality