additional_tags 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 743d2eba1f678392ca6d7197ef8ac31cc7b6ee05c183f7b74eba826510ecaf72
-  data.tar.gz: '09edc2c9f4990f6437b299e3495cb925f1eaefa47011ea49289d3e509273a72f'
+  metadata.gz: 5f6573f962ff7b251ce5afae13e2659985887d486d320fcb99f4c99892fa8a52
+  data.tar.gz: a258bcf71c8c53b40a5b7bcec92e9b6ff8a7dde6070fe5cfdc3eac0adb3d2ccb
 SHA512:
-  metadata.gz: edc36542d6caedfb732258d6431363954c44704f9ccafbb69d308ebd372e86824b90975f82fdbfb441f8b4c3c17833e020477dce1dd33a687054e527fbf9b5de
-  data.tar.gz: fd341693f9dbe550a2587aa60220a95c20c1b1b2a2e0ecd34226abcabf15d084ca044063e93d8ac7280d9546d6c0b1626f7cd02954c83b8c415e2b779f65b78c
+  metadata.gz: 46e6f62fae40af6b03d6b09a2b237f4049ab4d54ce30289e1fa7a74b9ee7f57df586feb3cf695f4268a86478365fee580db550e9b044c84281fcb464e2fde321
+  data.tar.gz: 8b1c9a8b5873b2b993f27d80186e9c7e0a024e201aba3c0125f47331c6fda50d673cbb1f572c17b2aef1b613b687f6a66c86c17d9b325f8c20e9c2bd8e6bf103

data/.eslintrc.yml

@@ -0,0 +1,17 @@
+env:
+  browser: true
+  jquery: true
+extends: 'eslint:recommended'
+rules:
+  indent:
+    - error
+    - 2
+  linebreak-style:
+    - error
+    - unix
+  quotes:
+    - error
+    - single
+  semi:
+    - error
+    - always

data/.github/workflows/brakeman.yml

@@ -12,25 +12,20 @@ jobs:
 
     - name: Install package dependencies
       run: >
-        sudo apt-get install --yes --quiet
-        pandoc
+        sudo apt-get install --yes --quiet pandoc
 
-    - name: Set up Ruby 2.6
-      uses: actions/setup-ruby@v1
-      with:
-        ruby-version: 2.6.x
-
-    - name: Set Gemfile
+    - name: Setup Gemfile
       run: |
-        echo "source 'https://rubygems.org'" > Gemfile
-        echo "group :test do" >> Gemfile
-        echo "  gem 'brakeman', require: false" >> Gemfile
-        echo "  gem 'pandoc-ruby', require: false" >> Gemfile
-        echo "end">> Gemfile
+        cp test/support/gemfile.rb Gemfile
+
+    - name: Setup Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.6
+        bundler-cache: true
 
     - name: Setup gems
       run: |
-        gem install bundler
         bundle install --jobs 4 --retry 3
 
     - name: Run Brakeman

data/.github/workflows/linters.yml

@@ -10,25 +10,22 @@ jobs:
     steps:
     - uses: actions/checkout@v1
 
-    - name: Set up Ruby 2.6
-      uses: actions/setup-ruby@v1
-      with:
-        ruby-version: 2.6.x
+    - name: Install package dependencies
+      run: >
+        sudo apt-get install --yes --quiet pandoc
 
-    - name: Set Gemfile
+    - name: Setup Gemfile
       run: |
-        echo "source 'https://rubygems.org'" > Gemfile
-        echo "group :test do" >> Gemfile
-        echo "  gem 'pandoc-ruby', require: false" >> Gemfile
-        echo "  gem 'rubocop', require: false" >> Gemfile
-        echo "  gem 'rubocop-performance', require: false" >> Gemfile
-        echo "  gem 'rubocop-rails', require: false" >> Gemfile
-        echo "  gem 'slim_lint', require: false" >> Gemfile
-        echo "end" >> Gemfile
+        cp test/support/gemfile.rb Gemfile
+
+    - name: Setup Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.6
+        bundler-cache: true
 
     - name: Setup gems
       run: |
-        gem install bundler
         bundle install --jobs 4 --retry 3
 
     - name: Run RuboCop

data/.github/workflows/tests.yml

@@ -10,9 +10,12 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ['2.6', '2.4']
-        redmine: ['4.1-stable', 'master']
+        ruby: ['2.7', '2.6', '2.5']
+        redmine: ['4.1-stable', '4.2-stable', 'master']
         db: ['postgres', 'mysql']
+        exclude:
+          - ruby: '2.7'
+            redmine: 4.1-stable
       fail-fast: false
 
     services:
@@ -32,13 +35,12 @@ jobs:
           --health-retries 5
 
       mysql:
-        image: mysql:5.7
+        image: mysql:8.0
         env:
-          MYSQL_USER: root
-          MYSQL_PASSWORD: ''
-          MYSQL_ALLOW_EMPTY_PASSWORD: yes
+          MYSQL_ROOT_PASSWORD: 'BestPasswordEver'
         ports:
-          - 3306:3306
+          # will assign a random free host port
+          - 3306/tcp
         options: >-
           --health-cmd="mysqladmin ping"
           --health-interval=10s
@@ -48,7 +50,7 @@ jobs:
     steps:
       - name: Verify MySQL connection from host
         run: |
-          mysql --host 127.0.0.1 --port 3306 -uroot -e "SHOW DATABASES"
+          mysql --host 127.0.0.1 --port ${{ job.services.mysql.ports[3306] }} -uroot -pBestPasswordEver -e "SHOW DATABASES"
         if: matrix.db == 'mysql'
 
       - name: Checkout Redmine
@@ -82,37 +84,27 @@ jobs:
           libmysqlclient-dev
 
       - name: Setup Ruby
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-
-      - name: Setup Cache
-        uses: actions/cache@v1
-        with:
-          path: vendor
-          key: v1-ruby-${{ matrix.ruby }}-redmine-${{ matrix.redmine }}
-
-      - name: Setup Bundler
-        run: |
-          gem install bundler -v '~> 1.0'
-          bundle config path "$(pwd)/vendor/bundle"
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
 
       - name: Prepare Redmine source
         working-directory: redmine
         run: |
-          sed -i '/rubocop/d' Gemfile
-          rm -f .rubocop*
           cp plugins/additional_tags/test/support/database-${{ matrix.db }}.yml config/database.yml
           cp plugins/additional_tags/test/support/configuration.yml config/configuration.yml
 
       - name: Install Ruby dependencies
         working-directory: redmine
         run: |
-          bundle install --jobs=4 --retry=3 --without development
+          bundle config set --local without 'development'
+          bundle install --jobs=4 --retry=3
 
       - name: Generate session store secret
         env:
           RAILS_ENV: test
+          MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
         working-directory: redmine
         run: |
           bundle exec rake generate_secret_token
@@ -120,6 +112,7 @@ jobs:
       - name: Run Redmine DB and migration tasks
         env:
           RAILS_ENV: test
+          MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
         working-directory: redmine
         run: |
           bundle exec rake db:create db:migrate redmine:plugins:migrate
@@ -127,13 +120,13 @@ jobs:
       - name: Run tests
         env:
           RAILS_ENV: test
-          REDMINE_VERSION: ${{ matrix.redmine }}
+          MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
         working-directory: redmine
         run: bundle exec rake redmine:plugins:test NAME=additional_tags RUBYOPT="-W0"
 
       - name: Run uninstall test
         env:
           RAILS_ENV: test
-          REDMINE_VERSION: ${{ matrix.redmine }}
+          MYSQL_PORT: ${{ job.services.mysql.ports[3306] }}
         working-directory: redmine
         run: bundle exec rake redmine:plugins:migrate NAME=additional_tags VERSION=0

data/.rubocop.yml

@@ -6,7 +6,7 @@ Rails:
   Enabled: true
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
   TargetRailsVersion: 5.2
   NewCops: enable
 
@@ -72,4 +72,6 @@ Style/HashTransformValues:
   Enabled: false
 
 Naming/VariableNumber:
-  Enabled: false
+  Enabled: true
+  Exclude:
+    - 'test/**/*'

data/.slim-lint.yml

@@ -23,3 +23,4 @@ linters:
       - Style/IfUnlessModifier
       - Style/WhileUntilModifier
       - Style/Next
+      - Layout/SpaceBeforeBrackets

data/README.md

@@ -30,33 +30,32 @@ Start using it, too. The example image shows the centralized tag management in t
 
 ![screenshot](https://raw.githubusercontent.com/AlphaNodes/additional_tags/master/doc/images/additional-tags-framework.png)
 
-
 ## Why another Tag plugin?
 
-1.  Main reason: a stable tag solution for a current Redmine version is needed - NOW
-2.  Other plugins are no longer maintained or not available on a public community plattform as github or gitlab
-3.  Redmine (core) does not support tags. A feature request for issue tags exists since 2008, see [#1448](https://www.redmine.org/issues/1448).
-4.  Lots of plugins are using its own tag implementation (redmine_knowledgebase, redmine_contacts, redmine_products, redmine_passwords, redmine_db, ....). A common functional base was required. This plugin closes this gap. It would be great, if other plugins would use ``additional_tags`` for it.
+1. Main reason: a stable tag solution for a current Redmine version is needed - NOW
+2. Other plugins are no longer maintained or not available on a public community plattform as github or gitlab
+3. Redmine (core) does not support tags. A feature request for issue tags exists since 2008, see [#1448](https://www.redmine.org/issues/1448).
+4. Lots of plugins are using its own tag implementation (redmine_knowledgebase, redmine_contacts, redmine_products, redmine_passwords, redmine_db, ....). A common functional base was required. This plugin closes this gap. It would be great, if other plugins would use ``additional_tags`` for it.
 
 ## Requirements
 
--   Redmine `>= 4.1.0`
--   Ruby `>= 2.4.10`
--   Redmine plugins: [additionals](https://www.redmine.org/plugins/additionals)
+- Redmine `>= 4.1.0`
+- Ruby `>= 2.5`
+- Redmine plugins: [additionals](https://www.redmine.org/plugins/additionals)
 
 ## Installing
 
-Choose 1a OR 1b
+### 1. Get right plugin version
 
-1a. Clone this repository into `redmine/plugins/additional_tags`.
+To install stable version of additional_tags, use
 
 ```shell
-cd redmine/plugins
-git clone https://github.com/alphanodes/additionals.git
-git clone https://github.com/alphanodes/additional_tags.git
+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
 ```
 
-1b. Add the gem to your Gemfile.local:
+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:
 
 ```ruby
 gem 'additional_tags'
@@ -65,15 +64,22 @@ gem 'additional_tags'
 At the moment, additionals should be installed before using gem method. In later versions
 addtionals plugins is usable as gem, too.
 
-2.  Install dependencies and migrate database.
+If you want to use the latest development version, use
+
+```shell
+cd $REDMINE_ROOT
+git clone https://github.com/alphanodes/additionals.git plugins/additionals
+git clone https://github.com/alphanodes/additional_tags.git plugins/additional_tags
+```
+
+### 2. Install dependencies and migrate database.
 
 ```shell
 bundle install
 bundle exec rake redmine:plugins:migrate RAILS_ENV=production
 ```
 
-3.  Restart your Redmine web server.
-
+### 3. Restart your Redmine web server.
 
 ## Running tests
 
@@ -95,12 +101,11 @@ If you use [redmine_tags](https://github.com/ixti/redmine_tags) or [redmineup_ta
 ``additional_tags`` uses its own database tables, to prevent conflicts with other plugins (e.g. redmine_knowledgebase, redmine_contacts, etc)
 To migrate your data to ``additional_tags`` use the following steps (order is important):
 
-1.  Remove plugin directory of your old plugin, e.g plugin/redmine_tags
-2.  Install ``additional_tags`` as is descript above (this automatically migrate data to new tables)
+1. Remove plugin directory of your old plugin, e.g plugin/redmine_tags
+2. Install ``additional_tags`` as is descript above (this automatically migrate data to new tables)
 
 The old database tables are existing after these steps.
 
-
 ## Uninstall
 
 ```shell
@@ -109,18 +114,16 @@ bundle exec rake redmine:plugins:migrate NAME=additional_tags VERSION=0 RAILS_EN
 rm -rf plugins/additional_tags
 ```
 
-
 ## License
 
 This plugin is licensed under the terms of GNU/GPL v2.
 See LICENSE for details.
 
-
 ## Credits
 
 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)
+- [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.

data/additional_tags.gemspec

@@ -19,9 +19,9 @@ 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.4'
+  spec.required_ruby_version = '>= 2.5'
 
-  spec.add_runtime_dependency 'acts-as-taggable-on', '~> 6.0'
+  spec.add_runtime_dependency 'acts-as-taggable-on', '~> 7.0'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/app/controllers/additional_tags_controller.rb

@@ -10,11 +10,9 @@ class AdditionalTagsController < ApplicationController
 
   def destroy
     @tags.each do |tag|
-      begin
-        tag.reload.destroy
-      rescue ::ActiveRecord::RecordNotFound
-        Rails.logger.warn "Tag #{tag} could not be deleted"
-      end
+      tag.reload.destroy
+    rescue ::ActiveRecord::RecordNotFound
+      Rails.logger.warn "Tag #{tag} could not be deleted"
     end
     redirect_back_or_default @tag_list_path
   end

data/app/helpers/additional_tags_helper.rb

@@ -104,9 +104,12 @@ module AdditionalTagsHelper
                         options[:link],
                         style: tag_style
               elsif options[:link_wiki_tag]
-                link_to safe_join(tag_name),
-                        project_wiki_index_path(options[:project], tag: tag_object.name),
-                        style: tag_style
+                link = if options[:project].present?
+                         project_wiki_index_path options[:project], tag: tag_object.name
+                       else
+                         wiki_path tag_object.name
+                       end
+                link_to safe_join(tag_name), link, style: tag_style
               else
                 link_to safe_join(tag_name),
                         tag_url(tag_object.name, options),
@@ -146,19 +149,22 @@ module AdditionalTagsHelper
     s.join sep
   end
 
+  def additional_tag_sep(use_colors)
+    if use_colors.nil? || use_colors
+      ' '
+    else
+      ', '
+    end
+  end
+
   def additional_tag_links(tag_list, options = {})
     return if tag_list.blank?
 
-    sep = if options[:use_colors].nil? || options[:use_colors]
-            ' '
-          else
-            ', '
-          end
-
     unsorted = options.delete(:unsorted)
     tag_list = AdditionalTags::Tags.sort_tag_list(tag_list) unless unsorted
 
-    safe_join tag_list.map { |tag| additional_tag_link tag, options }, sep
+    safe_join tag_list.map { |tag| additional_tag_link tag, options },
+              additional_tag_sep(options[:use_colors])
   end
 
   private

data/app/helpers/additional_tags_wiki_helper.rb

@@ -8,10 +8,50 @@ module AdditionalTagsWikiHelper
   end
 
   def render_sidebar_tags
-    render_tags_list sidebar_tags,
-                     show_count: AdditionalTags.setting?(:show_with_count),
-                     style: AdditionalTags.setting(:tags_sidebar).to_sym,
-                     link_wiki_tag: true,
-                     project: @project
+    options = { show_count: AdditionalTags.setting?(:show_with_count),
+                style: AdditionalTags.setting(:tags_sidebar).to_sym,
+                link_wiki_tag: true,
+                project: @project }
+
+    render_tags_list sidebar_tags, options
+  end
+
+  def render_wiki_index_title(project, tag = nil)
+    if tag.present?
+      if project.nil?
+        title = [link_to(l(:label_wiki), wiki_index_path)]
+        title << Additionals::LIST_SEPARATOR
+        title << t(:label_wiki_index_for_tag_html, tag: tag)
+        safe_join title, ' '
+      else
+        t :label_wiki_index_for_tag_html, tag: tag
+      end
+    else
+      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/views/additional_tags/settings/_general.html.slim

@@ -2,30 +2,26 @@ fieldset.settings
   legend = l :label_general
 
   p
-    = label_tag 'settings[tags_sidebar]', l(:tags_sidebar)
-    = select_tag 'settings[tags_sidebar]',
-                 options_for_select(%w[none list cloud simple_cloud].collect { |v| [l("tags_sidebar_#{v}"), v] },
-                                    @settings[:tags_sidebar])
+    = additionals_settings_select :tags_sidebar,
+                                  options_for_select(%w[none list cloud simple_cloud].collect { |v| [l("tags_sidebar_#{v}"), v] },
+                                                     @settings[:tags_sidebar])
 
   p
     = additionals_settings_checkbox :show_with_count
 
   p
-    = label_tag 'settings[tags_sort_by]', l(:tags_sort_by)
-    = select_tag 'settings[tags_sort_by]',
-                 options_for_select(%w[name count].collect { |v| [l("tags_sort_by_#{v}"), v] },
-                                    @settings[:tags_sort_by])
+    = additionals_settings_select :tags_sort_by,
+                                  options_for_select(%w[name count].collect { |v| [l("tags_sort_by_#{v}"), v] },
+                                                     @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])
 
   p
-    = label_tag 'settings[tags_suggestion_order]', l(:tags_suggestion_order)
-    = select_tag 'settings[tags_suggestion_order]',
-                 options_for_select(%w[name last_created count].collect { |v| [l("tags_order_by_#{v}"), v] },
-                                    @settings['tags_suggestion_order'])
-
+    = additionals_settings_select :tags_suggestion_order,
+                                  options_for_select(%w[name last_created count].collect { |v| [l("tags_order_by_#{v}"), v] },
+                                                     @settings['tags_suggestion_order'])
   p
     = additionals_settings_checkbox :use_colors
 

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 = l :label_wiki_index_for_tag, @tag
+h2 = render_wiki_index_title @project, @tag
 
 - if @pages.empty?
   p.nodata = l :label_no_data

data/assets/javascripts/tags.js

@@ -1,19 +1,19 @@
 $(function () {
-    $('body').on('click', '.most_used_tags .most_used_tag', function (e) {
-        var $tagsSelect = $('select#issue_tag_list');
-        var tag = e.target.innerText;
-        if ($tagsSelect.find("option[value='" + tag + "']").length === 0) {
-            var newOption = new Option(tag, tag, true, true);
-            $tagsSelect.append(newOption).trigger("change");
-        }
+  $('body').on('click', '.most_used_tags .most_used_tag', function (e) {
+    var $tagsSelect = $('select#issue_tag_list');
+    var tag = e.target.innerText;
+    if ($tagsSelect.find('option[value=\'' + tag + '\']').length === 0) {
+      var newOption = new Option(tag, tag, true, true);
+      $tagsSelect.append(newOption).trigger('change');
+    }
 
-        mostUsedTags = $.grep(mostUsedTags, function(t) { return t != tag; });
-        var tagsHtml = mostUsedTags.map(function(tag) {
-            return '<span class="most_used_tag">' + tag + '</span>';
-        }).join(', ');
+    var mostUsedTags = $.grep(mostUsedTags, function(t) { return t != tag; });
+    var tagsHtml = mostUsedTags.map(function(tag) {
+      return '<span class="most_used_tag">' + tag + '</span>';
+    }).join(', ');
 
-        var $mostUsedTagsContainer = $(e.target).parent('.most_used_tags');
-        $mostUsedTagsContainer.empty();
-        $mostUsedTagsContainer.append(tagsHtml);
-    });
+    var $mostUsedTagsContainer = $(e.target).parent('.most_used_tags');
+    $mostUsedTagsContainer.empty();
+    $mostUsedTagsContainer.append(tagsHtml);
+  });
 });

data/assets/stylesheets/tags.css

@@ -1,6 +1,6 @@
 /* stylelint-disable font-family-no-missing-generic-family-keyword */
 
-#admin-menu a.tags::before {
+#admin-menu a.additional-tags::before {
   font-family: Font Awesome\ 5 Free;
   font-size: 1.2em;
   font-weight: 900;
@@ -8,12 +8,12 @@
   padding-right: 4px;
 }
 
-#admin-menu a.tags {
+#admin-menu a.additional-tags {
   padding-left: 0;
 }
 
 /* Mobile menu style FontAwesome icon */
-.flyout-is-active #admin-menu li a.tags {
+.flyout-is-active #admin-menu li a.additional-tags {
   padding-left: 8px !important;
 }
 

data/config/locales/bg.yml

@@ -12,7 +12,7 @@ bg:
   label_show_with_count: "Показване на брой маркирани обекти"
   label_tags_tag: "Маркер"
   label_use_colors: "Използване на цветове"
-  label_wiki_index_for_tag: "Wiki страници с маркер %{value}"
+  label_wiki_index_for_tag_html: "Wiki страници с маркер <em>%{tag}</em>"
   notice_failed_to_add_tags: "Добавянето на маркери е неуспешно"
   notice_tags_added: "Маркерите са добавени"
   permission_add_wiki_tags: "Добавяне на маркери за wiki страници"
@@ -26,8 +26,8 @@ bg:
   tags_sidebar_list: "Списък"
   tags_sidebar_none: "Не"
   tags_sidebar_simple_cloud: "Обикновен облак"
-  tags_sidebar: "Показване на маркерите в страничния панел"
+  label_tags_sidebar: "Показване на маркерите в страничния панел"
   tags_sort_by_count: "брой обекти"
   tags_sort_by_name: "Име"
-  tags_sort_by: "Сортиране на маркерите по"
-  tags_suggestion_order: "Ред на предлагане"
+  label_tags_sort_by: "Сортиране на маркерите по"
+  label_tags_suggestion_order: "Ред на предлагане"

data/config/locales/cs.yml

@@ -12,7 +12,7 @@ cs:
   label_show_with_count: "Zobrazit částku na značce"
   label_tags_tag: "Tag"
   label_use_colors: "Použijte barvy"
-  label_wiki_index_for_tag: "Wiki stránky se značkou %{value}"
+  label_wiki_index_for_tag_html: "Wiki stránky se značkou <em>%{tag}</em>"
   notice_failed_to_add_tags: "Přidání značek se nezdařilo"
   notice_tags_added: "Přidány značky"
   permission_add_wiki_tags: "Přidejte značky wiki"
@@ -26,8 +26,8 @@ cs:
   tags_sidebar_list: "Seznam"
   tags_sidebar_none: "Žádný"
   tags_sidebar_simple_cloud: "Simple cloud"
-  tags_sidebar: "Zobrazit značky na postranním panelu jako"
+  label_tags_sidebar: "Zobrazit značky na postranním panelu jako"
   tags_sort_by_count: "Počet"
   tags_sort_by_name: "Název"
-  tags_sort_by: "Řazení značek podle"
-  tags_suggestion_order: "Objednávka návrhu"
+  label_tags_sort_by: "Řazení značek podle"
+  label_tags_suggestion_order: "Objednávka návrhu"

data/config/locales/de.yml

@@ -12,7 +12,7 @@ de:
   label_show_with_count: Zeige Anzahl zu TAG
   label_tags_tag: TAG
   label_use_colors: Farben verwenden
-  label_wiki_index_for_tag: Wiki Seiten mit TAG %{value}
+  label_wiki_index_for_tag_html: Wiki Seiten mit TAG <em>%{tag}</em>
   notice_failed_to_add_tags: Fehler beim hinzufügen der TAGs
   notice_tags_added: Tags hinzugefügt
   permission_add_wiki_tags: Wiki TAGs hinzufügen
@@ -26,8 +26,8 @@ de:
   tags_sidebar_list: Liste
   tags_sidebar_none: Keine
   tags_sidebar_simple_cloud: Einfache Cloud
-  tags_sidebar: Zeige TAGs in der Sidebar
+  label_tags_sidebar: Zeige TAGs in der Sidebar
   tags_sort_by_count: Anzahl
   tags_sort_by_name: Name
-  tags_sort_by: Sortiere TAGs nach
-  tags_suggestion_order: Reihenfolge der Vorschläge
+  label_tags_sort_by: Sortiere TAGs nach
+  label_tags_suggestion_order: Reihenfolge der Vorschläge

data/config/locales/en.yml

@@ -12,7 +12,7 @@ en:
   label_show_with_count: "Display amount on tag"
   label_tags_tag: "Tag"
   label_use_colors: "Use colors"
-  label_wiki_index_for_tag: "Wiki pages with tag %{value}"
+  label_wiki_index_for_tag_html: "Wiki pages with tag <em>%{tag}</em>"
   notice_failed_to_add_tags: "Failed to add tags"
   notice_tags_added: "Tags added"
   permission_add_wiki_tags: "Add wiki tags"
@@ -26,8 +26,8 @@ en:
   tags_sidebar_list: "List"
   tags_sidebar_none: "None"
   tags_sidebar_simple_cloud: "Simple cloud"
-  tags_sidebar: "Display tags on sidebar as"
+  label_tags_sidebar: "Display tags on sidebar as"
   tags_sort_by_count: "Count"
   tags_sort_by_name: "Name"
-  tags_sort_by: "Sort tags by"
-  tags_suggestion_order: "Suggestion order"
+  label_tags_sort_by: "Sort tags by"
+  label_tags_suggestion_order: "Suggestion order"

data/config/locales/es.yml

@@ -12,7 +12,7 @@ es:
   label_show_with_count: "Mostrar la cantidad en la tags"
   label_tags_tag: "Tag"
   label_use_colors: "Usar los colores"
-  label_wiki_index_for_tag: "Páginas Wiki con la tags %{value}"
+  label_wiki_index_for_tag_html: "Páginas Wiki con la tags <em>%{tag}</em>"
   notice_failed_to_add_tags: "No se han añadido tags"
   notice_tags_added: "Tags añadidas"
   permission_add_wiki_tags: "Añadir tags wiki"
@@ -26,8 +26,8 @@ es:
   tags_sidebar_list: "Lista"
   tags_sidebar_none: "Ninguno"
   tags_sidebar_simple_cloud: "Simple cloud"
-  tags_sidebar: "Mostrar las tags en la barra lateral como"
+  label_tags_sidebar: "Mostrar las tags en la barra lateral como"
   tags_sort_by_count: "Cuenta"
   tags_sort_by_name: "Nombre"
-  tags_sort_by: "Ordenar las tags por"
-  tags_suggestion_order: "Orden de sugerencia"
+  label_tags_sort_by: "Ordenar las tags por"
+  label_tags_suggestion_order: "Orden de sugerencia"

data/config/locales/fr.yml

@@ -12,7 +12,7 @@ fr:
   label_show_with_count: "Afficher le montant sur l'tags"
   label_tags_tag: "Tag"
   label_use_colors: "Utiliser les couleurs"
-  label_wiki_index_for_tag: "Pages wiki avec la tags %{value}"
+  label_wiki_index_for_tag_html: "Pages wiki avec la tags <em>%{tag}</em>"
   notice_failed_to_add_tags: "Omission d'ajouter des tags"
   notice_tags_added: "Tags ajoutés"
   permission_add_wiki_tags: "Ajouter des tags wiki"
@@ -26,8 +26,8 @@ fr:
   tags_sidebar_list: "Liste"
   tags_sidebar_none: "Aucune"
   tags_sidebar_simple_cloud: "Simple cloud"
-  tags_sidebar: "Afficher les tags sur la barre latérale comme"
+  label_tags_sidebar: "Afficher les tags sur la barre latérale comme"
   tags_sort_by_count: "Compter"
   tags_sort_by_name: "Nom"
-  tags_sort_by: "Trier les balises par"
-  tags_suggestion_order: "Ordre de suggestion"
+  label_tags_sort_by: "Trier les balises par"
+  label_tags_suggestion_order: "Ordre de suggestion"

data/config/locales/it.yml

@@ -12,7 +12,7 @@ it:
   label_show_with_count: "Visualizzare l'importo sul tag"
   label_tags_tag: "Tag"
   label_use_colors: "Utilizzare i colori"
-  label_wiki_index_for_tag: "Pagine Wiki con tag %{value}"
+  label_wiki_index_for_tag_html: "Pagine Wiki con tag <em>%{tag}</em>"
   notice_failed_to_add_tags: "Non è stato possibile aggiungere tag"
   notice_tags_added: "Tag aggiunti"
   permission_add_wiki_tags: "Aggiungi tag wiki"
@@ -26,8 +26,8 @@ it:
   tags_sidebar_list: "Elenco"
   tags_sidebar_none: "Nessuno"
   tags_sidebar_simple_cloud: "Simple cloud"
-  tags_sidebar: "Visualizzare i tag sulla barra laterale come"
+  label_tags_sidebar: "Visualizzare i tag sulla barra laterale come"
   tags_sort_by_count: "Contate"
   tags_sort_by_name: "Nome"
-  tags_sort_by: "Ordina i tag per"
-  tags_suggestion_order: "Ordine di suggerimento"
+  label_tags_sort_by: "Ordina i tag per"
+  label_tags_suggestion_order: "Ordine di suggerimento"

data/config/locales/ja.yml

@@ -12,7 +12,7 @@ ja:
   label_show_with_count: "タグに金額を表示"
   label_tags_tag: "Tag"
   label_use_colors: "色を使う"
-  label_wiki_index_for_tag: "タグが付いているウィキのページ %{value}"
+  label_wiki_index_for_tag_html: "タグが付いているウィキのページ <em>%{tag}</em>"
   notice_failed_to_add_tags: "タグの追加に失敗"
   notice_tags_added: "追加されたタグ"
   permission_add_wiki_tags: "wikiタグの追加"
@@ -26,8 +26,8 @@ ja:
   tags_sidebar_list: "リスト"
   tags_sidebar_none: "なし"
   tags_sidebar_simple_cloud: "シンプルなクラウド"
-  tags_sidebar: "サイドバーにタグを"
+  label_tags_sidebar: "サイドバーにタグを"
   tags_sort_by_count: "伯爵"
   tags_sort_by_name: "名前"
-  tags_sort_by: "タグを並べ替える"
-  tags_suggestion_order: "ご提案の順番"
+  label_tags_sort_by: "タグを並べ替える"
+  label_tags_suggestion_order: "ご提案の順番"

data/config/locales/ko.yml

@@ -12,7 +12,7 @@ ko:
   label_show_with_count: "태그에 금액 표시"
   label_tags_tag: "Tag"
   label_use_colors: "색상 사용"
-  label_wiki_index_for_tag: "태그가있는 위키 페이지 %{value}"
+  label_wiki_index_for_tag_html: "태그가있는 위키 페이지 <em>%{tag}</em>"
   notice_failed_to_add_tags: "태그를 추가하지 못했습니다."
   notice_tags_added: "추가 된 태그"
   permission_add_wiki_tags: "위키 태그 추가"
@@ -26,8 +26,8 @@ ko:
   tags_sidebar_list: "명부"
   tags_sidebar_none: "없음"
   tags_sidebar_simple_cloud: "단순 클라우드"
-  tags_sidebar: "사이드 바에 태그 표시"
+  label_tags_sidebar: "사이드 바에 태그 표시"
   tags_sort_by_count: "카운트"
   tags_sort_by_name: "이름"
-  tags_sort_by: "태그 정렬 기준"
-  tags_suggestion_order: "제안 순서"
+  label_tags_sort_by: "태그 정렬 기준"
+  label_tags_suggestion_order: "제안 순서"

data/config/locales/pl.yml

@@ -12,7 +12,7 @@ pl:
   label_show_with_count: "Wyświetlanie ilości na etykiecie"
   label_tags_tag: "Tag"
   label_use_colors: "Używaj kolorów"
-  label_wiki_index_for_tag: "Strony Wiki z tagiem %{value}"
+  label_wiki_index_for_tag_html: "Strony Wiki z tagiem <em>%{tag}</em>"
   notice_failed_to_add_tags: "Nie dodano znaczników"
   notice_tags_added: "Tagi dodane"
   permission_add_wiki_tags: "Dodaj znaczniki wiki"
@@ -26,8 +26,8 @@ pl:
   tags_sidebar_list: "Lista"
   tags_sidebar_none: "Brak"
   tags_sidebar_simple_cloud: "Simple cloud"
-  tags_sidebar: "Wyświetlać znaczniki na pasku bocznym jako"
+  label_tags_sidebar: "Wyświetlać znaczniki na pasku bocznym jako"
   tags_sort_by_count: "Hrabia"
   tags_sort_by_name: "Nazwa"
-  tags_sort_by: "Sortuj znaczniki według"
-  tags_suggestion_order: "Zamówienie ofertowe"
+  label_tags_sort_by: "Sortuj znaczniki według"
+  label_tags_suggestion_order: "Zamówienie ofertowe"

data/config/locales/pt-BR.yml

@@ -12,7 +12,7 @@ pt-BR:
   label_show_with_count: "Mostrar quantidade na etiqueta"
   label_tags_tag: "Tag"
   label_use_colors: "Usar cores"
-  label_wiki_index_for_tag: "Páginas Wiki com tag %{value}"
+  label_wiki_index_for_tag_html: "Páginas Wiki com tag <em>%{tag}</em>"
   notice_failed_to_add_tags: "Falha em adicionar tags"
   notice_tags_added: "Tags adicionadas"
   permission_add_wiki_tags: "Adicionar etiquetas wiki"
@@ -26,8 +26,8 @@ pt-BR:
   tags_sidebar_list: "Lista"
   tags_sidebar_none: "Nenhum"
   tags_sidebar_simple_cloud: "Simple cloud"
-  tags_sidebar: "Mostrar etiquetas na barra lateral como"
+  label_tags_sidebar: "Mostrar etiquetas na barra lateral como"
   tags_sort_by_count: "Conde"
   tags_sort_by_name: "Nome"
-  tags_sort_by: "Ordenar tags por"
-  tags_suggestion_order: "Pedido de sugestão"
+  label_tags_sort_by: "Ordenar tags por"
+  label_tags_suggestion_order: "Pedido de sugestão"

data/config/locales/ru.yml

@@ -12,7 +12,7 @@ ru:
   label_show_with_count: "Отображаемое количество на теге"
   label_tags_tag: "Tag"
   label_use_colors: "Использовать цвета"
-  label_wiki_index_for_tag: "Вики-страницы с тегом %{value}"
+  label_wiki_index_for_tag_html: "Вики-страницы с тегом <em>%{tag}</em>"
   notice_failed_to_add_tags: "Не удалось добавить теги"
   notice_tags_added: "Теги добавлены"
   permission_add_wiki_tags: "Добавить вики-теги"
@@ -26,8 +26,8 @@ ru:
   tags_sidebar_list: "Список"
   tags_sidebar_none: "Нет"
   tags_sidebar_simple_cloud: "Simple cloud"
-  tags_sidebar: "DОтображать теги на боковой панели как"
+  label_tags_sidebar: "DОтображать теги на боковой панели как"
   tags_sort_by_count: "Посчитать"
   tags_sort_by_name: "Имя"
-  tags_sort_by: "Сортировать метки по"
-  tags_suggestion_order: "Порядок предложения"
+  label_tags_sort_by: "Сортировать метки по"
+  label_tags_suggestion_order: "Порядок предложения"

data/init.rb

@@ -23,7 +23,9 @@ Redmine::Plugin.register :additional_tags do
   end
 
   menu :admin_menu,
-       :tags, { controller: 'settings', action: 'plugin', id: 'additional_tags' }, caption: :field_tags
+       :additional_tags,
+       { controller: 'settings', action: 'plugin', id: 'additional_tags' },
+       caption: :field_tags
 end
 
 Rails.configuration.to_prepare do

data/lib/additional_tags.rb

@@ -69,10 +69,17 @@ module AdditionalTags
       setting(:tags_sidebar).present? && setting(:tags_sidebar) != 'none'
     end
 
-    def sql_for_tags_field(klass, operator, value)
-      compare   = operator.eql?('=') ? 'IN' : 'NOT IN'
-      ids_list  = klass.tagged_with(value).map(&:id).push(0).join(',')
-      "(#{klass.table_name}.id #{compare} (#{ids_list})) "
+    def sql_for_tags_field(klass, operator, values)
+      compare = ['=', '*'].include?(operator) ? 'IN' : 'NOT IN'
+
+      case operator
+      when '=', '!'
+        ids_list = klass.tagged_with(values, any: true).pluck :id
+        "(#{klass.table_name}.id #{compare} (#{ids_list.join ','}))" if ids_list.present?
+      else
+        entries = ActsAsTaggableOn::Tagging.where taggable_type: klass.name
+        "(#{klass.table_name}.id #{compare} (#{entries.select(:taggable_id).to_sql}))"
+      end
     end
 
     private

data/lib/additional_tags/hooks.rb

@@ -13,14 +13,18 @@ module AdditionalTags
     render_on :view_reports_issue_report_split_content_right, partial: 'tags_simple'
     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: 'tags_sidebar'
+    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 = {})
-      tags_journal context[:issue], context[:params]
+      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
@@ -53,6 +57,12 @@ module AdditionalTags
 
     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]
 

data/lib/additional_tags/patches/agile_query_patch.rb

@@ -17,7 +17,7 @@ module AdditionalTags
         def sql_for_tags_field(_field, operator, value)
           case operator
           when '=', '!'
-            issues = Issue.tagged_with(value.clone)
+            issues = Issue.tagged_with(value.clone, any: true)
           when '!*'
             issues = Issue.joins(:tags).uniq
           else

data/lib/additional_tags/patches/auto_completes_controller_patch.rb

@@ -22,7 +22,7 @@ module AdditionalTags
 
         def wiki_tags
           @name = params[:q].to_s
-          @tags = WikiPage.available_tags project: @project, name_like: @name
+          @tags = WikiPage.available_tags project: nil, name_like: @name
           render layout: false, partial: 'additional_tag_list', locals: { unsorted: true }
         end
 

data/lib/additional_tags/patches/time_entry_query_patch.rb

@@ -22,7 +22,7 @@ module AdditionalTags
           return unless AdditionalTags.setting?(:active_issue_tags) && User.current.allowed_to?(:view_issue_tags, project, global: true)
 
           add_available_filter 'issue.tags',
-                               type: :list,
+                               type: :list_optional,
                                name: l('label_attribute_of_issue', name: l(:field_tags)),
                                values: -> { available_issue_tags_values }
         end
@@ -45,7 +45,8 @@ module AdditionalTags
 
         def available_issue_tags_values
           Issue.available_tags(project: project)
-               .map { |c| [c.name, c.name] }
+               .pluck(:name)
+               .map { |name| [name, name] }
         end
       end
     end

data/lib/additional_tags/patches/wiki_controller_patch.rb

@@ -8,6 +8,8 @@ module AdditionalTags
         helper :additional_tags
         helper :additional_tags_wiki
 
+        include AdditionalTagsWikiHelper
+
         before_action :find_page_for_update_tags, only: :update_tags
       end
 
@@ -27,7 +29,7 @@ module AdditionalTags
           @tag = params[:tag]
           return super unless AdditionalTags.setting?(:active_wiki_tags) && @tag.present?
 
-          load_pages_for_index_with_tag
+          @pages = wiki_pages_with_tag @tag, @project
 
           respond_to do |format|
             format.html do
@@ -39,19 +41,6 @@ module AdditionalTags
 
         private
 
-        def load_pages_for_index_with_tag
-          pattern = "%#{@tag.to_s.strip}%"
-          @pages = @wiki.pages
-                        .joins(AdditionalTags::Tags.tag_to_joins(WikiPage))
-                        .where("LOWER(#{ActiveRecord::Base.connection.quote_table_name(ActsAsTaggableOn.tags_table)}.name) LIKE LOWER(:p)",
-                               p: pattern)
-                        .with_updated_on
-                        .distinct
-                        .reorder("#{WikiPage.table_name}.title")
-                        .includes(wiki: :project)
-                        .includes(:parent).to_a
-        end
-
         # find_existing_page can not be used from wiki_controller, because it would be disable index only rule
         def find_page_for_update_tags
           @page = @wiki.find_page params[:id]

data/lib/additional_tags/patches/wiki_page_patch.rb

@@ -8,7 +8,9 @@ module AdditionalTags
 
         acts_as_ordered_taggable
 
-        safe_attributes 'tag_list'
+        alias_method :safe_attributes_without_tags=, :safe_attributes=
+        alias_method :safe_attributes=, :safe_attributes_with_tags=
+
         before_save :sort_tag_list
       end
 
@@ -26,6 +28,25 @@ module AdditionalTags
       end
 
       module InstanceMethods
+        def safe_attributes_with_tags=(attrs, user = User.current)
+          if !attrs.is_a?(Array) && attrs && attrs[:tag_list]
+            tags = attrs[:tag_list]
+            tags = Array(tags).reject(&:empty?)
+
+            # only assign it, if changed
+            if tags == tag_list ||
+               !AdditionalTags.setting?(:active_wiki_tags) ||
+               !user.allowed_to?(:add_wiki_tags, project)
+              attrs.delete :tag_list
+            else
+              attrs[:tag_list] = tags
+              self.tag_list = tags
+            end
+          end
+
+          send 'safe_attributes_without_tags=', attrs, user
+        end
+
         private
 
         def sort_tag_list

data/lib/additional_tags/version.rb

@@ -1,3 +1,3 @@
 module AdditionalTags
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze unless defined? VERSION
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: additional_tags
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - AlphaNodes
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-25 00:00:00.000000000 Z
+date: 2021-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -59,6 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".eslintrc.yml"
 - ".github/workflows/brakeman.yml"
 - ".github/workflows/linters.yml"
 - ".github/workflows/tests.yml"
@@ -163,14 +164,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Redmine plugin for adding tag functionality