additional_tags 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30f90dcfc93dd66550bb8087b9f3a94fa411484f4876ccb9d837548edf0b64ae
-  data.tar.gz: df63312af11e2ce492b5b36bb3b0b1ce9f3e0b28c7d901512301226e06dcd65b
+  metadata.gz: d8ed778f6643bfc7ef2e38f292fa92d0dab319705968e9791bb820b0e284124b
+  data.tar.gz: 29db0db1b7c774c387fe46b7294d5be48dc71ab0857cd8fca9eebea610e17e6b
 SHA512:
-  metadata.gz: 40e8517cddee11354aa8979506352abdbbb4e10774ce74f7f3d5c637b7bb2c03fd1fc75bd0e51f39ea23525aa8da2a54cb8089e3738b49d42718e5ea54031657
-  data.tar.gz: 429ea55984a5c3225db53f9a5699bf897a54ae09f9c4bf76fb24b5358702a6bb7547c9efba57938bfeb3c6e3b877f3ce7bffafef7069f645914d6b9b38f8f4a9
+  metadata.gz: c76cb8da0ffab5ef74651cc450150fc1c057e4bfff58633cc4a8aa17fdd0ff91134537bf5cacb9f85783a624b628e21d0705b30b656819583ccc7d62f4fd2f5d
+  data.tar.gz: b12dc1e15cf91fc1514ecda011fd3e7f8186b64be0046fe7df894853b52db7045f2713aa00ae67101e1a42d7b44947256a129c21553021a3892bea0612eab34c

data/app/helpers/additional_tags_helper.rb

@@ -39,7 +39,7 @@ module AdditionalTagsHelper
 
   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
 

data/app/models/migrate_tag.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class MigrateTag < ActiveRecord::Base
+class MigrateTag < Rails.version < '7.1' ? ActiveRecord::Base : ApplicationRecord
   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 < Rails.version < '7.1' ? ActiveRecord::Base : ApplicationRecord
   self.table_name = 'taggings'
   belongs_to :migrate_tag, foreign_key: :tag_id, inverse_of: :migrate_taggings
   belongs_to :taggable, polymorphic: true

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,
@@ -37,6 +36,9 @@ fieldset.settings
   p
     = additionals_settings_checkbox :active_issue_tags
 
+  p
+    = additionals_settings_checkbox :show_tags_after_queries
+
   p
     = additionals_settings_checkbox :open_issues_only
 

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

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/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/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/issue_query_patch.rb

@@ -42,7 +42,8 @@ module AdditionalTags
       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/plugin_version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: additional_tags
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - AlphaNodes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-01 00:00:00.000000000 Z
+date: 2024-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
@@ -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
@@ -155,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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