additional_tags 1.0.6 → 1.0.7

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 = '1.0.7' unless defined? 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,11 +198,11 @@ 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?

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

data/package.json

@@ -0,0 +1,8 @@
+{
+  "dependencies": {},
+  "devDependencies": {
+    "eslint": "^8.0.0",
+    "stylelint": "^14.0.0",
+    "stylelint-config-standard": "^29.0.0"
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: additional_tags
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - AlphaNodes
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-14 00:00:00.000000000 Z
+date: 2022-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
@@ -92,6 +92,7 @@ files:
 - app/helpers/additional_tags_wiki_helper.rb
 - app/jobs/additional_tags_job.rb
 - app/jobs/additional_tags_remove_unused_tag_job.rb
+- app/models/additional_tag.rb
 - app/models/migrate_tag.rb
 - app/models/migrate_tagging.rb
 - app/models/query_tags_column.rb
@@ -143,6 +144,7 @@ files:
 - db/migrate/20201123093214_migrate_existing_tags.rb
 - doc/images/additional-tags-framework.png
 - doc/images/additional-tags.gif
+- doc/images/tag-overview.png
 - init.rb
 - lib/additional_tags.rb
 - lib/additional_tags/hooks/model_hook.rb
@@ -175,6 +177,7 @@ files:
 - lib/additional_tags/plugin_version.rb
 - lib/additional_tags/tags.rb
 - lib/tasks/additional_tags.rake
+- package.json
 homepage: https://github.com/alphanodes/additional_tags
 licenses:
 - GPL-2.0
@@ -195,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Redmine plugin for adding tag functionality