Skip to content

Commit 78d2d88

Browse files
committed
updated acts-as-taggable-on to 3.4.1 version; fixed query by tag
1 parent c1451a5 commit 78d2d88

File tree

4 files changed

+8
-5
lines changed

4 files changed

+8
-5
lines changed

Diff for: Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
gem 'acts-as-taggable-on', '~> 3.0.1'
1+
gem 'acts-as-taggable-on', '~> 3.4.1'

Diff for: app/controllers/issue_tags_controller.rb

+2
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ def destroy
2222
end
2323
end
2424

25+
tag.taggings.reload
26+
2527
if tag.taggings.empty?
2628
tag.destroy
2729
end

Diff for: init.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
name 'Redmine Tagging plugin'
2323
author 'friflaj, nettsundere, nodecarter'
2424
description 'Wiki/issues tagging'
25-
version '0.1.0'
25+
version '0.1.1'
2626

2727
settings :default => { :dynamic_font_size => "1", :sidebar_tagcloud => "1", :wiki_pages_inline => "0", :issues_inline => "0" }, :partial => 'tagging/settings'
2828

Diff for: lib/redmine_tagging/patches/query_patch.rb

+4-3
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,10 @@ def tagging_sql_not_equal(field)
8484
end
8585

8686
def tagging_sql_equal(field)
87-
selected_values = values_for(field).map { |tag| tag_with_sharp(tag) }
88-
sql = selected_values.collect { |val| "'#{ActiveRecord::Base.connection.quote_string(val.downcase.gsub('\'', ''))}'" }.join(',')
89-
"(#{Issue.table_name}.id in (select taggable_id from taggings join tags on tags.id = taggings.tag_id where taggable_type='Issue' and lower(tags.name) in (#{sql})))"
87+
selected_values = values_for(field).map { |tag| tag_with_sharp(tag).upcase }
88+
selected_values += values_for(field).map { |tag| tag_with_sharp(tag).downcase }
89+
sql = selected_values.collect { |val| "'#{ActiveRecord::Base.connection.quote_string(val.gsub('\'', ''))}'" }.join(',')
90+
"(#{Issue.table_name}.id in (select taggable_id from taggings join tags on tags.id = taggings.tag_id where taggable_type='Issue' and tags.name in (#{sql})))"
9091
end
9192

9293
def tag_without_sharp(tag)

0 commit comments

Comments
 (0)