Merged r15539 and r15550 (#23067).

git-svn-id: http://svn.redmine.org/redmine/branches/3.3-stable@15557 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/field_format.rb b/lib/redmine/field_format.rb
index 77014579bf1fb15873d0b6d7075f1918adc42ebc..7734b3984c04994d8a201bca1fa3cce3b27d67f6 100644 (file)
--- 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 1f3bc20eabd8f489a1296624b82a41fc83b1699f..13177375b91014c5489bf45eaae5a7d470e302b5 100644 (file)
--- 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 '<a href="http://foo/bar">bar</a>', 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 '<a href="http://foo/foo%20bar">foo bar</a>', field.format.formatted_custom_value(self, custom_value, true)
+  end
 end