redmineup 1.1.13 → 1.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4d2181d902dbfa9a13995df17ff80c6a9eaea15fd54c6a918a6695ced32ed40
-  data.tar.gz: 88ee188a9626a4483f6ebc108a5f2ae174de4bde94e5d04128f60b0f3d6d8799
+  metadata.gz: 497432257e3dd60a1140adb02b491af3e36a669a8c2af4cb42fb810f09b26b4c
+  data.tar.gz: e07c21fc5a9358e9706fb2d922919c994a17013704d583cfd87282162a03c40e
 SHA512:
-  metadata.gz: bbd631a43429432a3c3f2e208527b601dd3d1dca57d260d314f2808d485b96d8f8ef29baf31a6836c026c30cf5d453075082d6d65cf548efba7fe5393a862b75
-  data.tar.gz: 49ccf2ace3f1af01aa00a748a94c93f6deb994fd5bc0e0a23db7f4e98c7ed371aeff27b8561a0c8cce1aeee19d9e8e5333ae4c7ee77c699bb9c8bb1c092daff3
+  metadata.gz: '09ea94ec0283833d3c2daa10ca34239374eb64dccbfd8130dabea3f292947c0d9f88e92e33b5e17c544bacf0014f782aa712fbc280a5b7e45e5368d1f07ebb17'
+  data.tar.gz: 959335aba0d22370913ced0db6b826a93eb2a856422aa0e22a3f85d21a2c6d0cba6a5788068391441944db221ac300a555b7339dca588ee40a6348011bc58ab4

data/app/assets/stylesheets/calendars.css

@@ -10,6 +10,3 @@ table.cal td.odd p.day-num {color: #bbb;}
 table.cal td.today {background:#ffffdd;}
 table.cal td.today p.day-num {font-weight: bold;}
 table.cal td.nwday:not(.odd) {background-color:#f1f1f1;}
-table.cal .starting a.issue, p.cal.legend .starting {background: url(../../../images/bullet_go.png) no-repeat -1px -2px; padding-left:16px;}
-table.cal .ending a.issue, p.cal.legend .ending {background: url(../../../images/bullet_end.png) no-repeat -1px -2px; padding-left:16px;}
-table.cal .starting.ending a.issue, p.cal.legend .starting.ending {background: url(../../../images/bullet_diamond.png) no-repeat -1px -2px; padding-left:16px;}

data/app/assets/stylesheets/redmineup.css

@@ -432,9 +432,6 @@ table.cal td.odd p.day-num {color: #bbb;}
 table.cal td.today {background:#ffffdd;}
 table.cal td.today p.day-num {font-weight: bold;}
 table.cal td.nwday:not(.odd) {background-color:#f1f1f1;}
-table.cal .starting a.issue, p.cal.legend .starting {background: url(../../../images/bullet_go.png) no-repeat -1px -2px; padding-left:16px;}
-table.cal .ending a.issue, p.cal.legend .ending {background: url(../../../images/bullet_end.png) no-repeat -1px -2px; padding-left:16px;}
-table.cal .starting.ending a.issue, p.cal.legend .starting.ending {background: url(../../../images/bullet_diamond.png) no-repeat -1px -2px; padding-left:16px;}
 
 #admin-menu a.icon-redmineup-money:not(:has(svg)) {
   background-image: url(../images/money.png);
@@ -462,9 +459,6 @@ ul.cal {
 .cal .calbody.today p.day-num {font-weight: bold;}
 .cal .calbody .icon {padding-top: 2px; padding-bottom: 3px;}
 .cal .calbody.nwday:not(.odd) {background-color:#f1f1f1;}
-.cal .starting a.issue, p.cal.legend .starting {background: url(../images/bullet_go.png) no-repeat -1px -2px; padding-left:16px;}
-.cal .ending a.issue, p.cal.legend .ending {background: url(../images/bullet_end.png) no-repeat -1px -2px; padding-left:16px;}
-.cal .starting.ending a.issue, p.cal.legend .starting.ending {background: url(../images/bullet_diamond.png) no-repeat -1px -2px; padding-left:16px;}
 @media screen and (max-width: 899px) {
   ul.cal { display: block }
   .cal .calhead { display: none }

data/doc/CHANGELOG

@@ -4,6 +4,15 @@ Redmine UP gem - general functions for plugins (tags, vote, viewing, currency)
 Copyright (C) 2011-2026 Kirill Bezrukov (RedmineUP)
 https://www.redmineup.com/
 
+== 2026-10-11 v1.1.15
+
+* Speeded up the tags list query (available_tags) on pages with a lot of tagged records
+
+== 2026-10-09 v1.1.14
+
+* Fixed missing calendar icons and extra padding in Redmine 6/7
+* Fixed tag field width in forms
+
 == 2026-08-25 v1.1.13
 
 * Updated patches from include to prepend

data/lib/redmineup/acts_as_taggable/up_acts_as_taggable.rb

@@ -129,43 +129,43 @@ module Redmineup
         #Return all avalible tags for a project or global
         #Example: Question.available_tags(:project => @project_id )
         def available_tags(options = {})
-          projects = [[options[:project]], options[:projects]].flatten.compact
           limit = options[:limit].to_i.zero? ? 30 : options[:limit].to_i
-          scope = Tag.where({})
-          class_name = quote_string_value(base_class.name)
-          join = []
-          join << "JOIN #{Tagging.table_name} ON #{Tagging.table_name}.tag_id = #{Tag.table_name}.id "
-          join << "JOIN #{table_name} ON #{table_name}.id = #{Tagging.table_name}.taggable_id
-            AND #{Tagging.table_name}.taggable_type = #{class_name} "
-          if attribute_names.include?('project_id') && projects.any?
-            join << "JOIN #{Project.table_name} ON #{Project.table_name}.id = #{table_name}.project_id"
-            scope = scope.where("#{table_name}.project_id IN (%s)", projects.map(&:id).join(','))
-          end
+          counts_sql = Tag.connection.unprepared_statement { tagged_records_scope(options).to_sql }
 
+          scope = Tag.joins("JOIN (#{counts_sql}) tag_counts ON tag_counts.tag_id = #{Tag.table_name}.id")
+          scope = scope.select("#{Tag.table_name}.*, tag_counts.count AS count")
           if options[:name_like].present?
             scope = scope.where("LOWER(#{Tag.table_name}.name) LIKE LOWER(?)", "%#{options[:name_like]}%")
           end
+          scope.order("#{Tag.table_name}.name").limit(limit)
+        end
 
-          group_fields = ''
-          group_fields << ", #{Tag.table_name}.created_at" if Tag.respond_to?(:created_at)
-          group_fields << ", #{Tag.table_name}.updated_at" if Tag.respond_to?(:updated_at)
-          group_fields << ", #{Tag.table_name}.color" if Tag.column_names.include?('color')
+        # tag_id => number of visible taggables. Extension point for available_tags.
+        def tagged_records_scope(options = {})
+          projects = [[options[:project]], options[:projects]].flatten.compact
+          scope = Tagging.unscoped.
+            joins("JOIN #{table_name} ON #{table_name}.id = #{Tagging.table_name}.taggable_id").
+            where("#{Tagging.table_name}.taggable_type = ?", base_class.name).
+            group("#{Tagging.table_name}.tag_id").
+            select("#{Tagging.table_name}.tag_id, COUNT(DISTINCT #{Tagging.table_name}.taggable_id) AS count")
+
+          projects_joined = false
+          if attribute_names.include?('project_id') && projects.any?
+            scope = scope.joins("JOIN #{Project.table_name} ON #{Project.table_name}.id = #{table_name}.project_id").
+              where("#{table_name}.project_id IN (?)", projects.map(&:id))
+            projects_joined = true
+          end
 
           if base_class.respond_to?(:visible_condition)
             visible_condition = base_class.visible_condition(User.current)
-            if visible_condition.include?('project_id') && join.all? { |jn| jn.exclude?('JOIN projects') }
-              join << "JOIN #{Project.table_name} ON #{Project.table_name}.id = #{table_name}.project_id"
+            if visible_condition.include?('project_id') && !projects_joined
+              scope = scope.joins("JOIN #{Project.table_name} ON #{Project.table_name}.id = #{table_name}.project_id")
             end
             scope = scope.where(visible_condition)
           end
-          scope = scope.joins(join.join(' '))
-          scope = scope.select("#{Tag.table_name}.*, COUNT(DISTINCT #{Tagging.table_name}.taggable_id) AS count")
-          scope = scope.group("#{Tag.table_name}.id, #{Tag.table_name}.name #{group_fields}")
-          scope = scope.having('COUNT(*) > 0')
-          scope = scope.order("#{Tag.table_name}.name")
-          scope = scope.limit(limit)
           scope
         end
+
         # Returns an array of related tags.
         # Related tags are all the other tags that are found on the models tagged with the provided tags.
         #

data/lib/redmineup/helpers/form_tag_helper.rb

@@ -67,7 +67,8 @@ module Redmineup
         options_for_select(value, value),
         {
           multiple:    true,
-          width:       width || '95%',
+          style:       "width: #{width || '95%'};",
+          width:       'style',
           url:         url || auto_complete_taggable_tags_path(taggable_type: taggable_type, project_id: project_id),
           placeholder: placeholder || l(:lable_redmineup_add_tag),
           tags:        true

data/lib/redmineup/version.rb

@@ -1,3 +1,3 @@
 module Redmineup
-  VERSION = '1.1.13'
+  VERSION = '1.1.15'
 end

data/redmineup.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://www.redmineup.com"
   spec.license       = "GPL-2.0"
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.start_with?("doc/dev/") || %w[AGENTS.md GLOSSARY.md].include?(f) }
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]

data/test/tags_helper_view_test.rb

@@ -35,7 +35,16 @@ class TagsHelperViewTest < ActionView::TestCase
                                 width: '60%', tags: false,
                                 placeholder: '+ add tag')
     assert_includes result, 'name="issue[tag_list][]"'
-    assert_includes result, '"width":"60%"'
+    assert_includes result, 'style="width: 60%;"'
+    assert_includes result, '"width":"style"'
     assert_includes result, '"tags":false'
   end
+
+  def test_tag_list_field_tag_with_default_width
+    result = tag_list_field_tag('issue[tag_list]', [],
+                                url: '/auto_completes/taggable_tags',
+                                placeholder: '+ add tag')
+    assert_includes result, 'style="width: 95%;"'
+    assert_includes result, '"width":"style"'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmineup
 version: !ruby/object:Gem::Version
-  version: 1.1.13
+  version: 1.1.15
 platform: ruby
 authors:
 - RedmineUP
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-25 00:00:00.000000000 Z
+date: 2026-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -124,7 +124,6 @@ files:
 - app/assets/javascripts/select2.js
 - app/assets/javascripts/select2_helpers.js
 - app/assets/stylesheets/calendars.css
-- app/assets/stylesheets/money.css
 - app/assets/stylesheets/redmineup.css
 - app/assets/stylesheets/select2.css
 - app/controllers/redmineup_controller.rb

data/app/assets/stylesheets/money.css

@@ -1,95 +0,0 @@
-#admin-menu a.icon-redmineup-money:not(:has(svg)) {
-  background-image: url(../images/money.png);
-}
-
-/***** Calendar *****/
-ul.cal {
-  list-style: none;
-  width: 100%;
-  padding: 0;
-  display: grid;
-  grid-template-columns: 2rem repeat(7, 1fr);
-  margin: 0;
-  border: 1px solid #c0c0c0;
-  border-spacing: 0;
-  border-radius: 3px;
-}
-
-.cal .calhead {
-  background-color:#eee;
-  text-align: center;
-  font-weight: bold;
-  padding: 4px
-}
-
-.cal .week-number {
-  background-color:#eee;
-  border:none;
-  font-size: 1em;
-  padding: 4px;
-  text-align: center;
-}
-
-.cal .week-number .label-week {
-  display: none;
-}
-
-.cal .calbody {
-  border: 1px solid #d7d7d7;
-  vertical-align: top;
-  font-size: 0.9em;
-  border-bottom: 0;
-  border-right: 0;
-  line-height: 1.2;
-  min-height: calc(1.2em * 6);
-  padding: 2px;
-}
-
-.cal .calbody p.day-num {font-size: 1.1em; text-align:right;}
-.cal .calbody .abbr-day {display:none}
-.cal .calbody.odd p.day-num {color: #bbb;}
-.cal .calbody.today {background:#ffd;}
-.cal .calbody.today p.day-num {font-weight: bold;}
-
-.cal .calbody .icon {padding-top: 2px; padding-bottom: 3px;}
-.cal .calbody.nwday:not(.odd) {background-color:#f1f1f1;}
-.cal .starting a.issue, p.cal.legend .starting {background: url(../images/bullet_go.png) no-repeat -1px -2px; padding-left:16px;}
-.cal .ending a.issue, p.cal.legend .ending {background: url(../images/bullet_end.png) no-repeat -1px -2px; padding-left:16px;}
-.cal .starting.ending a.issue, p.cal.legend .starting.ending {background: url(../images/bullet_diamond.png) no-repeat -1px -2px; padding-left:16px;}
-
-
-/* responsive.css */
-@media screen and (max-width: 899px)
-{
-  ul.cal {
-    display: block
-  }
-  .cal .calhead {
-    display: none
-  }
-
-  .cal .calbody {
-    min-height: calc(1.2em * 3);
-  }
-
-  .cal .calbody .abbr-day {
-    display: inline;
-  }
-
-  .cal .week-number {
-    border: 1px solid #c0c0c0;
-    text-align: left;
-    font-weight: bold;
-    background-color: #def;
-  }
-
-  .cal .week-number .label-week {
-    display: inline;
-  }
-
-  .cal .calbody p.day-num {
-    font-size: 1.1em;
-    text-align: left;
-  }
-}
-/***** End Calendar *****/