From 4566ac1ee9ee7ce0b41fcf72f855d268f45d0385 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 18 Jun 2016 10:16:51 +0000 Subject: [PATCH] Merged r15539 and r15550 (#23067). git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15558 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/field_format.rb | 4 +++- test/unit/lib/redmine/field_format/field_format_test.rb | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/redmine/field_format.rb b/lib/redmine/field_format.rb index ee438edf0..6974e88ab 100644 --- a/lib/redmine/field_format.rb +++ b/lib/redmine/field_format.rb @@ -15,6 +15,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +require 'uri' + module Redmine module FieldFormat def self.add(name, klass) @@ -212,7 +214,7 @@ module Redmine end end end - url + URI.encode(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 1f3bc20ea..13177375b 100644 --- a/test/unit/lib/redmine/field_format/field_format_test.rb +++ b/test/unit/lib/redmine/field_format/field_format_test.rb @@ -74,4 +74,12 @@ class Redmine::FieldFormatTest < ActionView::TestCase assert_equal "bar", field.format.formatted_custom_value(self, custom_value, false) assert_equal 'bar', field.format.formatted_custom_value(self, custom_value, true) end + + def test_text_field_with_url_pattern_and_value_containing_a_space_should_format_as_link + field = IssueCustomField.new(:field_format => 'string', :url_pattern => 'http://foo/%value%') + 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 'foo bar', field.format.formatted_custom_value(self, custom_value, true) + end end -- 2.39.5