diff options
| -rw-r--r-- | lib/redmine/field_format.rb | 12 | ||||
| -rw-r--r-- | test/unit/lib/redmine/field_format/field_format_test.rb | 16 |
2 files changed, 22 insertions, 6 deletions
diff --git a/lib/redmine/field_format.rb b/lib/redmine/field_format.rb index f6b120dc4..a1feed44a 100644 --- a/lib/redmine/field_format.rb +++ b/lib/redmine/field_format.rb @@ -209,19 +209,19 @@ module Redmine # %m1%, %m2%... => capture groups matches of the custom field regexp if defined def url_from_pattern(custom_field, value, customized) url = custom_field.url_pattern.to_s.dup - url.gsub!('%value%') {value.to_s} - url.gsub!('%id%') {customized.id.to_s} - url.gsub!('%project_id%') {(customized.respond_to?(:project) ? customized.project.try(:id) : nil).to_s} - url.gsub!('%project_identifier%') {(customized.respond_to?(:project) ? customized.project.try(:identifier) : nil).to_s} + url.gsub!('%value%') {URI.encode value.to_s} + url.gsub!('%id%') {URI.encode customized.id.to_s} + url.gsub!('%project_id%') {URI.encode (customized.respond_to?(:project) ? customized.project.try(:id) : nil).to_s} + url.gsub!('%project_identifier%') {URI.encode (customized.respond_to?(:project) ? customized.project.try(:identifier) : nil).to_s} if custom_field.regexp.present? url.gsub!(%r{%m(\d+)%}) do m = $1.to_i if matches ||= value.to_s.match(Regexp.new(custom_field.regexp)) - matches[m].to_s + URI.encode matches[m].to_s end end end - URI.encode(url) + url end protected :url_from_pattern diff --git a/test/unit/lib/redmine/field_format/field_format_test.rb b/test/unit/lib/redmine/field_format/field_format_test.rb index 13177375b..ebce81135 100644 --- a/test/unit/lib/redmine/field_format/field_format_test.rb +++ b/test/unit/lib/redmine/field_format/field_format_test.rb @@ -82,4 +82,20 @@ class Redmine::FieldFormatTest < ActionView::TestCase assert_equal "foo bar", field.format.formatted_custom_value(self, custom_value, false) assert_equal '<a href="http://foo/foo%20bar">foo bar</a>', field.format.formatted_custom_value(self, custom_value, true) end + + def test_text_field_with_url_pattern_should_not_encode_url_pattern + field = IssueCustomField.new(:field_format => 'string', :url_pattern => 'http://foo/bar#anchor') + custom_value = CustomValue.new(:custom_field => field, :customized => Issue.new, :value => "1") + + assert_equal "1", field.format.formatted_custom_value(self, custom_value, false) + assert_equal '<a href="http://foo/bar#anchor">1</a>', field.format.formatted_custom_value(self, custom_value, true) + end + + def test_text_field_with_url_pattern_should_encode_values + field = IssueCustomField.new(:field_format => 'string', :url_pattern => 'http://foo/%value%#anchor') + custom_value = CustomValue.new(:custom_field => field, :customized => Issue.new, :value => "foo bar") + + assert_equal "foo bar", field.format.formatted_custom_value(self, custom_value, false) + assert_equal '<a href="http://foo/foo%20bar#anchor">foo bar</a>', field.format.formatted_custom_value(self, custom_value, true) + end end |