additional_tags 1.0.6 → 3.0.9

data/config/locales/pl.yml

@@ -1,38 +1,44 @@
 pl:
+  activerecord:
+    errors:
+      messages:
+        invalid_mutually_exclusive_tags: "używa wzajemnie wykluczających się tagów"
+  field_issue_tags: "Znaczniki emisji"
   field_tag_list: Tags
   field_tags: Tags
-  field_issue_tags: Issue tags
   label_active_issue_tags: "Aktywacja znaczników emisji"
   label_active_wiki_tags: "Aktywacja tagów wiki"
   label_add_tags: "Dodaj znaczniki"
+  label_amount_entities_with_tags: "Kwota %{name} z Tags"
+  label_amount_tags: "Kwota Tags"
   label_edit_tags: "Edycja tagów"
   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_with_count: "Wyświetlanie ilości na etykiecie"
+  label_tag_color_theme: "Kolorowy motyw %{value}"
+  label_tags_colors: Kolor
+  label_tags_sidebar: "Wyświetlać znaczniki na pasku bocznym jako"
+  label_tags_sort_by: "Sortuj znaczniki według"
+  label_tags_suggestion_order: "Zamówienie ofertowe"
   label_tags_tag: "Tag"
-  label_use_colors: "Używaj kolorów"
-  label_wiki_index_for_tag_html: "Strony Wiki z tagiem <em>%{tag}</em>"
+  label_tags_without_color: "Bez koloru"
+  label_use_colors: "Użyj kolorów"
+  label_wiki_index_for_tag: "Strony Wiki z tagiem"
+  label_with_chart: "Z wykresem"
+  label_with_table_of_values: "Z tabelą wartości"
   notice_failed_to_add_tags: "Nie dodano znaczników"
   notice_tags_added: "Tagi dodane"
   permission_add_wiki_tags: "Dodaj znaczniki wiki"
   permission_create_issue_tags: "Dodaj znaczniki wydania"
   permission_edit_issue_tags: "Edycja znaczników wydania"
   permission_view_issue_tags: "Wyświetlanie znaczników emisji"
-  tags_order_by_last_created: "Ostatnio stworzony"
   tags_order_by_count: "Najczęściej używany"
+  tags_order_by_last_created: "Ostatnio stworzony"
   tags_order_by_name: "Nazwa"
   tags_sidebar_cloud: "Cloud"
   tags_sidebar_list: "Lista"
   tags_sidebar_none: "Brak"
   tags_sidebar_simple_cloud: "Simple cloud"
-  label_tags_sidebar: "Wyświetlać znaczniki na pasku bocznym jako"
   tags_sort_by_count: "Hrabia"
   tags_sort_by_name: "Nazwa"
-  label_tags_sort_by: "Sortuj znaczniki według"
-  label_tags_suggestion_order: "Zamówienie ofertowe"
-  label_with_table_of_values: "Z tabelą wartości"
-  label_with_chart: "Z wykresem"
-  label_amount_tags: "Kwota Tags"
-  label_amount_entities_with_tags: "Kwota %{name} z Tags"
-  label_quantity: "Ilość"

data/config/locales/pt-BR.yml

@@ -1,38 +1,44 @@
 pt-BR:
+  activerecord:
+    errors:
+      messages:
+        invalid_mutually_exclusive_tags: "utiliza etiquetas mutuamente exclusivas"
+  field_issue_tags: Issue tags
   field_tag_list: Tags
   field_tags: Tags
-  field_issue_tags: Issue tags
   label_active_issue_tags: "Ativar as etiquetas de emissão"
   label_active_wiki_tags: "Ativar as etiquetas wiki"
   label_add_tags: "Adicionar etiquetas"
+  label_amount_entities_with_tags: "Quantidade %{name} com etiquetas"
+  label_amount_tags: "Valor Etiquetas"
   label_edit_tags: "Editar etiquetas"
   label_manage_tags: "Gerenciar etiquetas"
   label_merge_selected_tags: "Fundir tags selecionadas"
   label_open_issues_only: "Exibir apenas questões em aberto"
   label_show_with_count: "Mostrar quantidade na etiqueta"
+  label_tag_color_theme: "Tema da cor %{value}"
+  label_tags_colors: "Cor"
+  label_tags_sidebar: "Mostrar etiquetas na barra lateral como"
+  label_tags_sort_by: "Ordenar tags por"
+  label_tags_suggestion_order: "Pedido de sugestão"
   label_tags_tag: "Tag"
+  label_tags_without_color: "Sem cor"
   label_use_colors: "Usar cores"
-  label_wiki_index_for_tag_html: "Páginas Wiki com tag <em>%{tag}</em>"
+  label_wiki_index_for_tag: "Páginas Wiki com tag"
+  label_with_chart: "Com gráfico"
+  label_with_table_of_values: "Com tabela de valores"
   notice_failed_to_add_tags: "Falha em adicionar tags"
   notice_tags_added: "Tags adicionadas"
   permission_add_wiki_tags: "Adicionar etiquetas wiki"
   permission_create_issue_tags: "Adicionar etiquetas de edição"
   permission_edit_issue_tags: "Editar etiquetas de edição"
   permission_view_issue_tags: "Exibir etiquetas de edição"
-  tags_order_by_last_created: "Última criação"
   tags_order_by_count: "Mais utilizados"
+  tags_order_by_last_created: "Última criação"
   tags_order_by_name: "Nome"
   tags_sidebar_cloud: "Cloud"
   tags_sidebar_list: "Lista"
   tags_sidebar_none: "Nenhum"
   tags_sidebar_simple_cloud: "Simple cloud"
-  label_tags_sidebar: "Mostrar etiquetas na barra lateral como"
   tags_sort_by_count: "Conde"
   tags_sort_by_name: "Nome"
-  label_tags_sort_by: "Ordenar tags por"
-  label_tags_suggestion_order: "Pedido de sugestão"
-  label_with_table_of_values: "Com tabela de valores"
-  label_with_chart: "Com gráfico"
-  label_amount_tags: "Valor Etiquetas"
-  label_amount_entities_with_tags: "Quantidade %{name} com etiquetas"
-  label_quantity: "Quantidade"

data/config/locales/ru.yml

@@ -1,38 +1,44 @@
 ru:
-  field_tag_list: Теги
-  field_tags: Теги
-  field_issue_tags: Теги задач
-  label_active_issue_tags: "Активировать теги задач"
-  label_active_wiki_tags: "Активировать теги вики"
-  label_add_tags: "Добавьте теги"
-  label_edit_tags: "Редактировать теги"
-  label_manage_tags: "Управление тегами"
-  label_merge_selected_tags: "Объединить выбранные теги"
+  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_with_count: "Отображать количество на теге"
-  label_tags_tag: "Тег"
+  label_show_with_count: "Отображать количество на метке"
+  label_tag_color_theme: "Цветовая тема %{value}"
+  label_tags_colors: "Цвет"
+  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_html: "Вики-страницы с тегом <em>%{tag}</em>"
-  notice_failed_to_add_tags: "Не удалось добавить теги"
-  notice_tags_added: "Теги добавлены"
-  permission_add_wiki_tags: "Добавление тегов вики"
-  permission_create_issue_tags: "Добавление тегов задач"
-  permission_edit_issue_tags: "Редактирование тегов задач"
-  permission_view_issue_tags: "Просмотр тегов задач"
-  tags_order_by_last_created: "Недавно созданные"
+  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: "Простое облако"
-  label_tags_sidebar: "Способ отображения тегов на боковой панели"
   tags_sort_by_count: "Количеству"
   tags_sort_by_name: "Имени"
-  label_tags_sort_by: "Сортировать теги по"
-  label_tags_suggestion_order: "Порядок предложения при вводе"
-  label_with_table_of_values: "С таблицей значений"
-  label_with_chart: "С графиком"
-  label_amount_tags: "Теги Сумма"
-  label_amount_entities_with_tags: "Сумма %{name} с тегами"
-  label_quantity: "Количество"

data/config/settings.yml

@@ -1,9 +1,9 @@
-active_issue_tags: 0
-active_wiki_tags: 0
-open_issues_only: 0
-show_with_count: 0
+active_issue_tags: '0'
+active_wiki_tags: '0'
+open_issues_only: '0'
+show_with_count: '0'
+tags_color_theme: '1'
 tags_sidebar: 'none'
 tags_sort_by: 'name'
 tags_sort_order: 'asc'
 tags_suggestion_order: 'name'
-use_colors: 1

data/lib/additional_tags/hooks/view_hook.rb

@@ -63,16 +63,28 @@ module AdditionalTags
       def issues_bulk_tags_fix(issue, params)
         return unless params && params[:issue]
 
-        old_tags = issue.tags.map(&:name)
-        new_tags = Array(params[:issue][:tag_list]).reject(&:empty?)
-        issue.tag_list = (old_tags + new_tags).uniq
+        common_tags = if params[:common_tags].present?
+                        params[:common_tags].split(ActsAsTaggableOn.delimiter).map(&:strip)
+                      else
+                        []
+                      end
+
+        current_tags = ActsAsTaggableOn::TagList.new issue.tags.to_a
+        new_tags = Array(params[:issue][:tag_list]).compact_blank
+
+        tags_to_add = new_tags - common_tags
+        tags_to_remove = common_tags - new_tags
+
+        current_tags.add tags_to_add
+        current_tags.remove tags_to_remove
+
+        issue.tag_list = current_tags
       end
 
       def tags_journal(issue, params)
         return unless params && params[:issue] && params[:issue][:tag_list]
 
-        issue.tags_to_journal Issue.find_by(id: issue.id)&.tag_list&.to_s,
-                              issue.tag_list.to_s
+        issue.tags_to_journal issue.tag_list_was&.to_s, issue.tag_list.to_s
       end
     end
   end

data/lib/additional_tags/patches/issue_patch.rb

@@ -13,6 +13,8 @@ module AdditionalTags
         before_save :prepare_save_tag_change
         before_save :sort_tag_list
 
+        validate :validate_tags, if: proc { AdditionalTags.setting?(:active_issue_tags) }
+
         after_commit :add_remove_unused_tags_job, on: %i[update destroy],
                                                   if: proc { AdditionalTags.setting?(:active_issue_tags) }
 
@@ -29,21 +31,58 @@ module AdditionalTags
           tags.all? { |tag| allowed_tags.include? tag }
         end
 
-        def group_by_status_with_tags(project = nil)
-          visible(User.current, project: project).joins(:status)
-                                                 .joins(:tags)
-                                                 .group(:is_closed, 'tag_id')
-                                                 .count
+        def group_by_status_with_tags(project = nil, user = User.current)
+          scope = if project && Setting.display_subprojects_issues?
+                    visible(user).where(AdditionalTags::Tags.subproject_sql(project))
+                  else
+                    visible user, project: project
+                  end
+
+          scope.joins(:status)
+               .joins(:tags)
+               .group(:is_closed, 'tag_id')
+               .count
         end
 
         def available_tags(**options)
-          options[:permission] = :view_issues
+          options[:permission] ||= :view_issue_tags
           tags = AdditionalTags::Tags.available_tags self, **options
           return tags unless options[:open_issues_only]
 
           tags.joins("JOIN #{IssueStatus.table_name} ON #{IssueStatus.table_name}.id = #{table_name}.status_id")
               .where(issue_statuses: { is_closed: false })
         end
+
+        def common_tag_list_from_issues(ids)
+          common_tags = ActsAsTaggableOn::Tag.joins(:taggings)
+                                             .select(
+                                               "#{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.tags_table}.id",
+                                               "#{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.tags_table}.name"
+                                             )
+                                             .where(taggings: { taggable_type: 'Issue', taggable_id: ids })
+                                             .group(
+                                               "#{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.tags_table}.id",
+                                               "#{ActiveRecord::Base.connection.quote_table_name ActsAsTaggableOn.tags_table}.name"
+                                             )
+                                             .having('count(*) = ?', ids.count).to_a
+
+          ActsAsTaggableOn::TagList.new common_tags
+        end
+
+        def load_visible_tags(issues, user = User.current)
+          return if issues.blank?
+
+          available_projects = Project.where(AdditionalTags::Tags.visible_condition(user)).ids
+
+          issues.each do |issue|
+            tags = if available_projects.include? issue.project_id
+                     issue.tags
+                   else
+                     []
+                   end
+            issue.instance_variable_set :@visible_tags, tags
+          end
+        end
       end
 
       module InstanceMethods
@@ -62,8 +101,6 @@ module AdditionalTags
           tags = attrs.delete :tag_list
           tags = Array(tags).reject(&:empty?)
 
-          Additionals.debug "tags: #{tags.inspect} - project: #{project&.id} - access: #{user.allowed_to? :create_issue_tags, project}"
-
           if user.allowed_to?(:create_issue_tags, project) ||
              user.allowed_to?(:edit_issue_tags, project) && Issue.allowed_tags?(tags)
             attrs[:tag_list] = tags # required fix for journal details
@@ -76,7 +113,8 @@ module AdditionalTags
 
           copy_from_without_tags arg, **options
           issue = arg.is_a?(Issue) ? arg : Issue.visible.find(arg)
-          self.tag_list = issue.tag_list
+          self.tags = issue.tags           # required for bulk copy
+          self.tag_list = tags.map(&:name) # required for copy
           self
         end
 
@@ -88,6 +126,13 @@ module AdditionalTags
 
           self.tag_list = AdditionalTags::Tags.sort_tags tags
         end
+
+        def validate_tags
+          return if !User.current.allowed_to?(:create_issue_tags, project) &&
+                    !(User.current.allowed_to?(:edit_issue_tags, project) && Issue.allowed_tags?(tags))
+
+          errors.add :tag_list, :invalid_mutually_exclusive_tags unless AdditionalTag.valid_mutually_exclusive_tag tag_list
+        end
       end
     end
   end

data/lib/additional_tags/patches/issue_query_patch.rb

@@ -15,6 +15,9 @@ module AdditionalTags
 
         alias_method :available_columns_without_tags, :available_columns
         alias_method :available_columns, :available_columns_with_tags
+
+        alias_method :issues_without_tags, :issues
+        alias_method :issues, :issues_with_tags
       end
 
       module InstanceOverwriteMethods
@@ -29,9 +32,24 @@ module AdditionalTags
 
           self
         end
+
+        def sql_for_tags_field(field, _operator, values)
+          build_sql_for_tags_field_with_permission klass: queried_class,
+                                                   operator: operator_for(field),
+                                                   values: values,
+                                                   permission: :view_issue_tags
+        end
       end
 
       module InstanceMethods
+        def issues_with_tags(**options)
+          issues = issues_without_tags(**options)
+          return issues unless has_column? :tags
+
+          Issue.load_visible_tags issues
+          issues
+        end
+
         def initialize_available_filters_with_tags
           initialize_available_filters_without_tags
 

data/lib/additional_tags/patches/queries_helper_patch.rb

@@ -15,9 +15,19 @@ module AdditionalTags
       module InstanceMethods
         def column_content_with_tags(column, item)
           if column.name == :issue_tags || item.is_a?(Issue) && column.name == :tags
-            additional_tag_links column.value(item),
-                                 tag_controller: 'issues',
-                                 use_colors: AdditionalTags.setting?(:use_colors)
+            tags = if item.instance_variable_defined? :@visible_tags
+                     item.instance_variable_get :@visible_tags
+                   elsif Setting.display_subprojects_issues?
+                     # permission check required (expensive)
+                     return unless User.current.allowed_to? :view_issue_tags, item.project
+
+                     column.value item
+                   else
+                     # no permission check required
+                     column.value item
+                   end
+
+            additional_tag_links tags, tag_controller: 'issues'
           else
             column_content_without_tags column, item
           end

data/lib/additional_tags/patches/query_patch.rb

@@ -11,7 +11,9 @@ module AdditionalTags
 
       module InstanceMethods
         def sql_for_tags_field(field, _operator, values)
-          build_sql_for_tags_field klass: queried_class, operator: operator_for(field), values: values
+          build_sql_for_tags_field klass: queried_class,
+                                   operator: operator_for(field),
+                                   values: values
         end
 
         def initialize_tags_filter(position: nil)
@@ -60,6 +62,25 @@ module AdditionalTags
           end
         end
 
+        # NOTE: should be used, if tags required permission check
+        def build_sql_for_tags_field_with_permission(klass:, operator:, values:, permission:)
+          compare = ['=', '*'].include?(operator) ? 'in' : 'not_in'
+          case operator
+          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 == '='
+          else
+            allowed_projects = Project.where(Project.allowed_to_condition(User.current, permission))
+                                      .select(:id)
+            ids_list = klass.tagged_with(klass.available_tags(skip_pre_condition: true), any: true)
+                            .where(project_id: allowed_projects).ids
+          end
+
+          "(#{klass.arel_table[:id].send(compare, ids_list).to_sql})"
+        end
+
+        # NOTE: should be used, if tags do not require permission check
         def build_sql_for_tags_field(klass:, operator:, values:)
           compare = ['=', '*'].include?(operator) ? 'IN' : 'NOT IN'
           case operator
@@ -69,7 +90,7 @@ module AdditionalTags
               "(#{klass.table_name}.id #{compare} (#{ids_list.join ','}))"
             elsif values.present? && operator == '='
               # special case: filter with deleted tag
-              '(1=0)'
+              AdditionalsQuery::NO_RESULT_CONDITION
             end
           else
             entries = ActsAsTaggableOn::Tagging.where taggable_type: klass.name

data/lib/additional_tags/patches/wiki_page_patch.rb

@@ -13,6 +13,7 @@ module AdditionalTags
         alias_method :safe_attributes_without_tags=, :safe_attributes=
         alias_method :safe_attributes=, :safe_attributes_with_tags=
 
+        validate :validate_tags
         before_save :sort_tag_list
       end
 
@@ -24,7 +25,7 @@ module AdditionalTags
 
         def available_tags(**options)
           options[:project_join] = project_joins
-          options[:permission] = :view_wiki_pages
+          options[:permission] ||= :view_wiki_pages
           AdditionalTags::Tags.available_tags self, **options
         end
 
@@ -106,6 +107,10 @@ module AdditionalTags
 
           self.tag_list = AdditionalTags::Tags.sort_tags tag_list
         end
+
+        def validate_tags
+          errors.add :tag_list, :invalid_mutually_exclusive_tags unless AdditionalTag.valid_mutually_exclusive_tag tag_list
+        end
       end
     end
   end

data/lib/additional_tags/plugin_version.rb

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

data/lib/additional_tags/tags.rb

@@ -3,13 +3,27 @@
 module AdditionalTags
   class Tags
     class << self
+      def visible_condition(user, **options)
+        permission = options[:permission] || :view_issue_tags
+        skip_pre_condition = options[:skip_pre_condition] || true
+
+        tag_access permission, user, skip_pre_condition: skip_pre_condition
+      end
+
       def available_tags(klass, **options)
         user = options[:user].presence || User.current
 
         scope = ActsAsTaggableOn::Tag.where({})
-        scope = scope.where "#{Project.table_name}.id = ?", options[:project] if options[:project]
+        if options[:project]
+          scope = if Setting.display_subprojects_issues?
+                    scope.where subproject_sql(options[:project])
+                  else
+                    scope.where projects: { id: options[:project] }
+                  end
+        end
+
         if options[:permission]
-          scope = scope.where tag_access(options[:permission], user)
+          scope = scope.where tag_access(options[:permission], user, skip_pre_condition: options[:skip_pre_condition])
         elsif options[:visible_condition]
           scope = scope.where klass.visible_condition(user)
         end
@@ -18,14 +32,7 @@ module AdditionalTags
         scope = scope.where "#{TAGGING_TABLE_NAME}.taggable_id!=?", options[:exclude_id] if options[:exclude_id]
         scope = scope.where options[:where_field] => options[:where_value] if options[:where_field].present? && options[:where_value]
 
-        columns = ["#{TAG_TABLE_NAME}.id",
-                   "#{TAG_TABLE_NAME}.name",
-                   "#{TAG_TABLE_NAME}.taggings_count",
-                   "COUNT(DISTINCT #{TAGGING_TABLE_NAME}.taggable_id) AS count"]
-
-        columns << "MIN(#{TAGGING_TABLE_NAME}.created_at) AS last_created" if options[:sort_by] == 'last_created'
-
-        scope.select(columns.to_list)
+        scope.select(table_columns(options[:sort_by]))
              .joins(tag_for_joins(klass, **options.slice(:project_join, :project, :without_projects)))
              .group("#{TAG_TABLE_NAME}.id, #{TAG_TABLE_NAME}.name, #{TAG_TABLE_NAME}.taggings_count").having('COUNT(*) > 0')
              .order(build_order_sql(options[:sort_by], options[:order]))
@@ -125,8 +132,23 @@ module AdditionalTags
         counts
       end
 
+      def subproject_sql(project)
+        "#{Project.table_name}.lft >= #{project.lft} " \
+          "AND #{Project.table_name}.rgt <= #{project.rgt}"
+      end
+
       private
 
+      def table_columns(sort_by)
+        columns = ["#{TAG_TABLE_NAME}.id",
+                   "#{TAG_TABLE_NAME}.name",
+                   "#{TAG_TABLE_NAME}.taggings_count",
+                   "COUNT(DISTINCT #{TAGGING_TABLE_NAME}.taggable_id) AS count"]
+
+        columns << "MIN(#{TAGGING_TABLE_NAME}.created_at) AS last_created" if sort_by == 'last_created'
+        columns.to_list
+      end
+
       def status_for_tag_value(scope:, tag_id:, group_id: nil, group_id_is_bool: false)
         value = if group_id_is_bool || group_id
                   if group_id_is_bool
@@ -176,17 +198,17 @@ module AdditionalTags
         joins
       end
 
-      def tag_access(permission, user)
+      def tag_access(permission, user, skip_pre_condition: false)
         projects_allowed = if permission.nil?
                              Project.visible.ids
                            else
-                             Project.where(Project.allowed_to_condition(user, permission)).ids
+                             Project.where(Project.allowed_to_condition(user, permission, skip_pre_condition: skip_pre_condition)).ids
                            end
 
         if projects_allowed.present?
           "#{Project.table_name}.id IN (#{projects_allowed.join ','})" unless projects_allowed.empty?
         else
-          '1=0'
+          AdditionalsQuery::NO_RESULT_CONDITION
         end
       end
     end

data/lib/additional_tags.rb

@@ -14,6 +14,11 @@ module AdditionalTags
       setting(:tags_sidebar).present? && setting(:tags_sidebar) != 'none'
     end
 
+    # color is used by default (if setting is missing, too)
+    def use_colors?
+      setting(:tags_color_theme).to_s != '0'
+    end
+
     private
 
     def setup