additional_tags 1.0.2 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '094d1e57c687d9c643b002e5e6134a457d47791a2b086c3c159d690242228488'
-  data.tar.gz: dbfd7b4cb744aef1df5d132615bc1d8816ac85ccb7b837b04376d2b1eb9a76d6
+  metadata.gz: 74f23c86bdd928603d2740edb89fbecf6061fa559bbd1a030b3221929c81ec70
+  data.tar.gz: fb2c25b2a00e1ee5530cf677fcd3474280075c0c60d028209240ec933631f71b
 SHA512:
-  metadata.gz: f95b50b1d98bb7f22c8a2d3bfc5d767ba85a6df06b5e259d9fe2a03ce2980f6577e948f6120f0fb831d3dee5155f88ebdab215534a3264fc24adb31749610122
-  data.tar.gz: 417da0e654d1d966592242c95dd12899638758023b0822499c92e2079d03c28f0b9788046ee161f6ce721df325a0cdd91f1bd6dfe621cb88f910d7b9c12dcd3e
+  metadata.gz: 8a86b18dbebc7599d1afcb2b63edbea742e32825de1693254c5f066c7a12067aee4dec0649d5c5768480b13e830102e380784e0025f91b4a1da690f085b1b3fe
+  data.tar.gz: 2ccee9443f19a4a5b193cb63dc1a2d0ae6f965a2f2c11c937e3c2066149baa56272329b8ffa087f5f55d1446440da85a3c9e3d5b69b03ea6b5c99c78d72a3885

data/.github/workflows/codeql-analysis.yml

@@ -0,0 +1,70 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '35 20 * * 2'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript', 'ruby' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
+        # Learn more about CodeQL language support at https://git.io/codeql-language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

data/.github/workflows/linters.yml

@@ -16,13 +16,13 @@ jobs:
 
     - name: Setup Gemfile
       run: |
-        touch .enable_dev
+        touch .enable_linters
         sed -i "3isource 'https://rubygems.org'" Gemfile
 
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 3.0
         bundler-cache: true
 
     - name: Setup gems
@@ -37,3 +37,7 @@ jobs:
       run: |
         bundle exec slim-lint app/views
       if: always()
+
+    - name: Run Brakeman
+      run: |
+        bundle exec brakeman -5

data/.github/workflows/tests.yml

@@ -10,17 +10,14 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['2.7', '2.6', '2.5']
-        redmine: ['4.1-stable', '4.2-stable', 'master']
+        ruby: ['2.7', '3.0', '3.1']
+        redmine: ['5.0-stable', 'master']
         db: ['postgres', 'mysql']
-        exclude:
-          - ruby: '2.7'
-            redmine: 4.1-stable
       fail-fast: false
 
     services:
       postgres:
-        image: postgres:13
+        image: postgres:14
         env:
           POSTGRES_DB: redmine
           POSTGRES_USER: postgres
@@ -83,6 +80,10 @@ jobs:
           libpq-dev
           libmysqlclient-dev
 
+      - name: Setup Gemfile
+        run: |
+          touch .enable_test
+
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -94,6 +95,7 @@ jobs:
         run: |
           cp plugins/additional_tags/test/support/database-${{ matrix.db }}.yml config/database.yml
           cp plugins/additional_tags/test/support/configuration.yml config/configuration.yml
+          cp plugins/additionals/test/support/additional_environment.rb config/additional_environment.rb
 
       - name: Install Ruby dependencies
         working-directory: redmine

data/.gitignore

@@ -5,5 +5,6 @@ tmp/
 Gemfile.lock
 .project
 .settings/
+.enable_*
 ._*
-.enable_dev
+*.gem

data/.rubocop.yml

@@ -1,14 +1,22 @@
 require:
   - rubocop-performance
   - rubocop-rails
+  - rubocop-minitest
+
+AllCops:
+  TargetRubyVersion: 2.7
+  TargetRailsVersion: 6.1
+  NewCops: enable
 
 Rails:
   Enabled: true
 
-AllCops:
-  TargetRubyVersion: 2.5
-  TargetRailsVersion: 5.2
-  NewCops: enable
+Minitest/MultipleAssertions:
+  Max: 15
+  Enabled: true
+
+Minitest/AssertPredicate:
+  Enabled: false
 
 Metrics/AbcSize:
   Enabled: false
@@ -47,6 +55,14 @@ Style/ExpandPathArguments:
 Rails/ApplicationJob:
   Enabled: false
 
+Lint/AmbiguousOperatorPrecedence:
+  Enabled: false
+
+Rails/ContentTag:
+  Enabled: true
+  Exclude:
+    - app/helpers/additional_tags_issues_helper.rb
+
 Rails/ApplicationRecord:
   Enabled: false
 
@@ -83,8 +99,12 @@ Style/OptionHash:
     - params
     - parameters
     - settings
-  Exclude:
-    - lib/additional_tags/patches/*.rb
+
+# postgresql and mysql are supported
+# autodetect does not work without database configuration
+Rails/BulkChangeTable:
+  Enabled: true
+  Database: postgresql
 
 Style/ReturnNil:
   Enabled: true
@@ -108,3 +128,8 @@ Naming/VariableNumber:
   Enabled: true
   Exclude:
     - 'test/**/*'
+
+# see https://github.com/rubocop/rubocop-rails/issues/578
+# redmine does not use load_defaults: https://rails.rubystyle.guide/#config-defaults
+Rails/RedundantPresenceValidationOnBelongsTo:
+  Enabled: false

data/README.md

@@ -1,30 +1,29 @@
 # Additional Tags - Tags for Redmine
 
-[![Rate at redmine.org](https://img.shields.io/badge/rate%20at-redmine.org-blue.svg?style=flat)](https://www.redmine.org/plugins/additional_tags) [![Run Linters](https://github.com/AlphaNodes/additional_tags/workflows/Run%20Linters/badge.svg)](https://github.com/AlphaNodes/additional_tags/actions?query=workflow%3A%22Run+Linters%22) [![Run Brakeman](https://github.com/AlphaNodes/additional_tags/workflows/Run%20Brakeman/badge.svg)](https://github.com/AlphaNodes/additional_tags/actions?query=workflow%3A%22Run+Brakeman%22) [![Run Tests](https://github.com/AlphaNodes/additional_tags/workflows/Tests/badge.svg)](https://github.com/AlphaNodes/additional_tags/actions?query=workflow%3ATests)
-
+[![Rate at redmine.org](https://img.shields.io/badge/rate%20at-redmine.org-blue.svg?style=flat)](https://www.redmine.org/plugins/additional_tags) [![Run Linters](https://github.com/AlphaNodes/additional_tags/workflows/Run%20Linters/badge.svg)](https://github.com/AlphaNodes/additional_tags/actions?query=workflow%3A%22Run+Linters%22) [![Run Tests](https://github.com/AlphaNodes/additional_tags/workflows/Tests/badge.svg)](https://github.com/AlphaNodes/additional_tags/actions?query=workflow%3ATests)
 
 ## Features
 
--   Tags for issues
--   Tags for wiki pages
--   Accented and non-latin characters supported for tag order
--   View, edit and create tag permissions for issues
--   Create permission for wiki tags
--   Managing tags
--   Custom tags and tagging tables (additional_tags and additional_taggings). If a other plugin
+- Tags for issues
+- Tags for wiki pages
+- Accented and non-latin characters supported for tag order
+- View, edit and create tag permissions for issues
+- Create permission for wiki tags
+- Managing tags
+- Custom tags and tagging tables (additional_tags and additional_taggings). If a other plugin
   used tags or tagging tables for issue or wiki tagging, there tags will be migrated automatically
--   Based on the very popular [acts-as-taggable-on](https://github.com/mbleigh/acts-as-taggable-on)
+- Based on the very popular [acts-as-taggable-on](https://github.com/mbleigh/acts-as-taggable-on)
 
 ![screenshot](https://raw.githubusercontent.com/AlphaNodes/additional_tags/master/doc/images/additional-tags.gif)
 
 Other plugins use additional_tags as framework in order to support tags for their entities.
 At the moment this are:
 
--   redmine_db (db entry tagging)
--   redmine_passwords (password tagging)
--   redmine_reporting (project tagging)
--   redmine_hrm (holiday tagging)
--   redmine_servicedesk (contact tagging)
+- redmine_db (db entry tagging)
+- redmine_passwords (password tagging)
+- redmine_reporting (project tagging)
+- redmine_hrm (holiday tagging)
+- redmine_servicedesk (contact tagging)
 
 Start using it, too. The example image shows the centralized tag management in the plugin configuration.
 
@@ -39,8 +38,8 @@ Start using it, too. The example image shows the centralized tag management in t
 
 ## Requirements
 
-- Redmine `>= 4.1.0`
-- Ruby `>= 2.5`
+- Redmine `>= 5.0`
+- Ruby `>= 2.7`
 - Redmine plugins: [additionals](https://www.redmine.org/plugins/additionals)
 
 ## Installing
@@ -52,7 +51,7 @@ To install stable version of additional_tags, use
 ```shell
 cd $REDMINE_ROOT
 git clone -b stable https://www.github.com/alphanodes/additionals.git plugins/additionals
-git clone -b 1.0.0 https://www.github.com/alphanodes/additional_tags.git plugins/additional_tags
+git clone -b stable https://www.github.com/alphanodes/additional_tags.git plugins/additional_tags
 ```
 
 It is also possible to use stable version as a gem package as an alternative. If you want it, add this to your $REDMINE_ROOT/Gemfile.local:

data/additional_tags.gemspec

@@ -2,13 +2,14 @@
 
 lib = File.expand_path '../lib', __FILE__
 $LOAD_PATH.unshift lib unless $LOAD_PATH.include? lib
-require 'additional_tags/version'
+require 'additional_tags/plugin_version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'additional_tags'
-  spec.version       = AdditionalTags::VERSION
+  spec.version       = AdditionalTags::PluginVersion::VERSION
   spec.authors       = ['AlphaNodes']
   spec.email         = ['alex@alphanodes.com']
+  spec.metadata      = { 'rubygems_mfa_required' => 'true' }
 
   spec.summary       = 'Redmine plugin for adding tag functionality'
   spec.description   = 'Redmine plugin for adding tag functionality'
@@ -21,9 +22,10 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename f }
   spec.require_paths = ['lib']
-  spec.required_ruby_version = '>= 2.5'
+  spec.required_ruby_version = '>= 2.7'
 
-  spec.add_runtime_dependency 'acts-as-taggable-on', '~> 7.0'
+  spec.add_runtime_dependency 'acts-as-taggable-on', '~> 9.0'
+  spec.add_runtime_dependency 'redmine_plugin_kit'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/app/controllers/additional_tags_controller.rb

@@ -7,6 +7,29 @@ class AdditionalTagsController < ApplicationController
   before_action :set_tag_list_path
 
   helper :additional_tags_issues
+  include AdditionalTagsHelper
+
+  accept_api_auth :index
+
+  # used by api calls
+  def index
+    raise 'type is not provided' if params[:type].blank?
+
+    type_info = manageable_tag_columns.detect { |m| m.first.to_s == params[:type] }
+    raise 'type is not supported' unless type_info
+
+    klass = type_info.first.to_s.camelize.constantize
+    raise "#{klass.name} does not support tags" unless klass.respond_to? :available_tags
+
+    @tags = klass.available_tags.to_a
+    @count = @tags.count
+    @tag_type = klass.name
+
+    respond_to do |format|
+      format.html { head :not_acceptable }
+      format.api
+    end
+  end
 
   def edit; end
 

data/app/helpers/additional_tags_helper.rb

@@ -15,12 +15,12 @@ module AdditionalTagsHelper
     if AdditionalTags.setting? :active_issue_tags
       columns[:issue] = { label: l(:label_issue_plural),
                           tag_controller: :issues,
-                          counts: Issue.available_tags.map { |tag| [tag.id, tag.count] }.to_h }
+                          counts: Issue.available_tags.to_h { |tag| [tag.id, tag.count] } }
     end
 
     if AdditionalTags.setting? :active_wiki_tags
       columns[:wiki] = { label: l(:label_wiki),
-                         counts: WikiPage.available_tags.map { |tag| [tag.id, tag.count] }.to_h }
+                         counts: WikiPage.available_tags.to_h { |tag| [tag.id, tag.count] } }
     end
 
     call_hook :helper_additional_manageable_tag_columns, columns: columns
@@ -43,13 +43,13 @@ module AdditionalTagsHelper
     columns
   end
 
-  def render_tags_list(tags, **options)
-    return if tags.blank?
+  def sort_tags_for_list(tags, sort_by: nil, sort_order: nil)
+    return tags if tags.size < 2
 
-    style = options.delete :style
-    tags = tags.all.to_a if tags.respond_to? :all
+    sort_by = AdditionalTags.setting :tags_sort_by if sort_by.blank?
+    sort_order = AdditionalTags.setting :tags_sort_order if sort_order.blank?
 
-    case "#{AdditionalTags.setting :tags_sort_by}:#{AdditionalTags.setting :tags_sort_order}"
+    case "#{sort_by}:#{sort_order}"
     when 'name:desc'
       tags = AdditionalTags::Tags.sort_tag_list(tags).reverse
     when 'count:asc'
@@ -60,6 +60,16 @@ module AdditionalTagsHelper
       tags = AdditionalTags::Tags.sort_tag_list tags
     end
 
+    tags
+  end
+
+  def render_tags_list(tags, **options)
+    return if tags.blank?
+
+    style = options.delete :style
+    tags = tags.all.to_a if tags.respond_to? :all
+    tags = sort_tags_for_list tags
+
     case style
     when :list
       list_el = 'ul'
@@ -84,20 +94,24 @@ module AdditionalTagsHelper
     content_tag(list_el, content, class: 'tags-cloud', style: (style == :simple_cloud ? 'text-align: left;' : ''))
   end
 
-  def additional_tag_link(tag_object, link: nil, link_wiki_tag: false, show_count: false, use_colors: nil, **options)
+  def additional_tag_link(tag_object, link: nil, link_wiki_tag: false, show_count: false, use_colors: nil, name: nil, **options)
     tag_name = []
-    tag_name << tag_object.name
+    tag_name << if name.nil?
+                  tag_object.name
+                else
+                  name
+                end
 
     options[:project] = @project if options[:project].blank? && @project.present?
+    use_colors = AdditionalTags.setting? :use_colors if use_colors.nil?
 
-    use_colors ||= AdditionalTags.setting? :use_colors
-    if use_colors
-      tag_bg_color = additional_tag_color tag_object.name
-      tag_fg_color = additional_tag_fg_color tag_bg_color
-      tag_style = "background-color: #{tag_bg_color}; color: #{tag_fg_color}"
-    end
+    tag_style = if use_colors
+                  tag_bg_color = additional_tag_color tag_object.name
+                  tag_fg_color = additional_tag_fg_color tag_bg_color
+                  "background-color: #{tag_bg_color}; color: #{tag_fg_color}"
+                end
 
-    tag_name << tag.span("(#{tag_object.count})", class: 'tag-count') if show_count
+    tag_name << tag.span(tag_object.count, class: 'tag-count') if show_count
 
     content = if link
                 link_to safe_join(tag_name),
@@ -151,8 +165,10 @@ module AdditionalTagsHelper
     use_colors ? ' ' : ', '
   end
 
-  def additional_tags_from_string(str)
-    str.to_s.split(',').map(&:strip)
+  def additional_tags_from_params(str)
+    tags = str.is_a?(Array) ? str : str.to_s.split(',')
+    tags.map!(&:strip)
+    tags.compact_blank
   end
 
   def additional_tag_links(tag_list, **options)
@@ -165,6 +181,31 @@ module AdditionalTagsHelper
               additional_tag_sep(use_colors: options[:use_colors])
   end
 
+  def link_to_issue_tags_totals(entries:, project:, open_issues_only:)
+    sum = if entries.blank? || entries.size.zero?
+            0
+          else
+            query = IssueQuery.new project: project, name: '_'
+            query.add_filter 'tags', '*'
+            query.filters['status_id'][:operator] = '*' if !open_issues_only && query.filters.key?('status_id')
+
+            query.issue_count
+          end
+
+    link_to sum, _project_issues_path(project,
+                                      set_filter: 1,
+                                      tags: '*',
+                                      status_id: open_issues_only ? 'o' : '*')
+  end
+
+  def issue_tag_status_filter(operator: nil, open_issues_only: false)
+    if operator
+      { field: :status_id, operator: operator }
+    elsif open_issues_only
+      { field: :status_id, operator: 'o' }
+    end
+  end
+
   private
 
   def tag_url(tag_name, filter: nil, tag_action: nil, tag_controller: nil, project: nil)
@@ -193,7 +234,7 @@ module AdditionalTagsHelper
   def add_tags(style, tags, content, item_el, options)
     tag_cloud tags, (1..8).to_a do |tag, weight|
       content << ' '.html_safe + content_tag(item_el,
-                                             additional_tag_link(tag, options),
+                                             additional_tag_link(tag, **options),
                                              class: "tag-nube-#{weight}",
                                              style: (style == :simple_cloud ? 'font-size: 1em;' : '')) + ' '.html_safe
     end

data/app/helpers/additional_tags_issues_helper.rb

@@ -7,7 +7,7 @@ module AdditionalTagsIssuesHelper
 
     if @issue.present? &&
        (defined?(controller_name) && controller_name == 'issues' && action_name == 'show' || !defined?(controller_name)) &&
-       User.current.allowed_to?(:view_issues, @project)
+       AdditionalTags.setting?(:active_issue_tags) && User.current.allowed_to?(:view_issue_tags, @project)
 
       api.array :tags do
         @issue.tags.each do |tag|
@@ -16,6 +16,16 @@ module AdditionalTagsIssuesHelper
       end
     end
 
+    if @time_entry.present? &&
+       (defined?(controller_name) && controller_name == 'timelog' && action_name == 'show' || !defined?(controller_name)) &&
+       AdditionalTags.setting?(:active_issue_tags) && User.current.allowed_to?(:view_issue_tags, @project)
+      api.array :issue_tags do
+        @time_entry.issue_tags.each do |tag|
+          api.tag id: tag.id, name: tag.name
+        end
+      end
+    end
+
     rc
   end
 
@@ -40,6 +50,6 @@ module AdditionalTagsIssuesHelper
                 project: @project }
 
     options[:tag_action] = 'show' if %w[gantts calendars].include? controller_name
-    render_tags_list sidebar_tags, options
+    render_tags_list sidebar_tags, **options
   end
 end

data/app/helpers/additional_tags_wiki_helper.rb

@@ -15,7 +15,7 @@ module AdditionalTagsWikiHelper
                 link_wiki_tag: true,
                 project: @project }
 
-    render_tags_list sidebar_tags, options
+    render_tags_list sidebar_tags, **options
   end
 
   def render_wiki_index_title(project, tag = nil)
@@ -32,28 +32,4 @@ module AdditionalTagsWikiHelper
       l :label_wiki
     end
   end
-
-  def wiki_pages_with_tag(tag, project = nil)
-    wiki = project&.wiki
-
-    scope = if wiki
-              wiki.pages
-            else
-              WikiPage.joins wiki: :project
-            end
-
-    scope = scope.visible User.current, project: project if scope.respond_to? :visible
-
-    scope = scope.joins(AdditionalTags::Tags.tag_to_joins(WikiPage))
-                 .where("LOWER(#{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.tags_table}.name) = LOWER(:p)",
-                        p: tag.to_s.strip)
-                 .with_updated_on
-                 .joins(wiki: :project)
-
-    if wiki.nil?
-      scope.order "#{Project.table_name}.name, #{WikiPage.table_name}.title"
-    else
-      scope.includes(:parent).order "#{WikiPage.table_name}.title"
-    end
-  end
 end

data/app/jobs/additional_tags_remove_unused_tag_job.rb

@@ -2,6 +2,11 @@
 
 class AdditionalTagsRemoveUnusedTagJob < AdditionalTagsJob
   def perform
+    # only once a minute to reduce load
+    cache_key = self.class.to_s
+    return if Rails.cache.read(cache_key) && !Rails.env.test?
+
+    Rails.cache.write cache_key, true, expires_in: 60
     AdditionalTags::Tags.remove_unused_tags
   end
 end

data/app/views/additional_tags/_body_bottom.html.slim

@@ -0,0 +1,19 @@
+= additionals_transform_to_select2 'assignee',
+                                    format_state: 'formatNameWithIcon',
+                                    multiple: true,
+                                    url: assignee_auto_completes_path(project_id: @project)
+
+= additionals_transform_to_select2 'author',
+                                    format_state: 'formatNameWithIcon',
+                                    multiple: true,
+                                    url: grouped_users_auto_completes_path(project_id: @project, with_ano: true, with_me: true)
+
+= additionals_transform_to_select2 'user_with_me',
+                                    format_state: 'formatNameWithIcon',
+                                    multiple: true,
+                                    url: grouped_users_auto_completes_path(project_id: @project, with_me: true)
+
+= additionals_transform_to_select2 'user',
+                                    format_state: 'formatNameWithIcon',
+                                    multiple: true,
+                                    url: grouped_users_auto_completes_path(project_id: @project)

data/app/views/additional_tags/_html_head.html.slim

@@ -1,6 +1,3 @@
 = stylesheet_link_tag 'tags', plugin: 'additional_tags'
 = javascript_include_tag 'tags', plugin: 'additional_tags'
-- if User.current.allowed_to?(:edit_issue_tags, @project, global: true) || \
-     User.current.allowed_to?(:create_issue_tags, @project, global: true) || \
-     User.current.allowed_to?(:add_wiki_tags, @project, global: true)
-  = additionals_library_load :select2
+= additionals_library_load :select2

data/app/views/additional_tags/_tag_list.html.slim

@@ -18,7 +18,7 @@
                     onclick: "$('#edit_tags_form').show(); $('#tags-data').hide(); return false;",
                     id: 'edit_tags_link'
 
-      #edit_tags_form style="display: none;"
+      #edit_tags_form.hidden
         = form_tag update_url, method: :put do
           = render partial: defined?(tags_form) ? tags_form : 'tags_form',
                    locals: { css_id: defined?(css_id) ? css_id : nil }

data/app/views/additional_tags/context_menu.html.slim

@@ -10,7 +10,4 @@ ul
                 merge_additional_tags_path(ids: @tags.collect(&:id)),
                 class: 'icon icon-tags-merge'
   li
-    = link_to l(:button_delete),
-              additional_tags_path(ids: @tags.collect(&:id), back_url: @back),
-              method: :delete, data: { confirm: l(:text_are_you_sure) },
-              class: 'icon icon-del'
+    = delete_link additional_tags_path(ids: @tags.collect(&:id), back_url: @back)

data/app/views/additional_tags/index.api.rsb

@@ -0,0 +1,5 @@
+api.array :tags, api_meta(total_count: @count, tag_type: @tag_type) do
+  @tags.each do |tag|
+    api.tag id: tag.id, name: tag.name, count: tag.count
+  end
+end