Fixed that integer custom fields with "Link values to URL" set are displayed as escaped html in text email (#16321).

git-svn-id: http://svn.redmine.org/redmine/trunk@12967 e93f8b46-1217-0410-a6f0-8f06a7374b81

3 files changed, 40 insertions, 1 deletions

diff --git a/lib/redmine/field_format.rb b/lib/redmine/field_format.rb
index 59c6c0090..3b567a0b8 100644
--- a/lib/redmine/field_format.rb
+++ b/lib/redmine/field_format.rb
@@ -148,7 +148,7 @@ module Redmine
 
       def formatted_value(view, custom_field, value, customized=nil, html=false)
         casted = cast_value(custom_field, value, customized)
-        if custom_field.url_pattern.present?
+        if html && custom_field.url_pattern.present?
           texts_and_urls = Array.wrap(casted).map do |single_value|
             text = view.format_object(single_value, false).to_s
             url = url_from_pattern(custom_field, single_value, customized)
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 2ad17ba1f..e82f3da99 100644
--- a/test/unit/lib/redmine/field_format/field_format_test.rb
+++ b/test/unit/lib/redmine/field_format/field_format_test.rb
@@ -51,4 +51,12 @@ class Redmine::FieldFormatTest < ActionView::TestCase
     assert_equal "*foo*\nbar", field.format.formatted_custom_value(self, custom_value, false)
     assert_include "<strong>foo</strong>", field.format.formatted_custom_value(self, custom_value, true)
   end
+
+  def test_text_field_with_url_pattern_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 => "bar")
+
+    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
 end
diff --git a/test/unit/lib/redmine/field_format/numeric_format_test.rb b/test/unit/lib/redmine/field_format/numeric_format_test.rb
new file mode 100644
index 000000000..b479cd0eb
--- /dev/null
+++ b/test/unit/lib/redmine/field_format/numeric_format_test.rb
@@ -0,0 +1,31 @@
+# Redmine - project management software

+# Copyright (C) 2006-2014  Jean-Philippe Lang

+#

+# This program is free software; you can redistribute it and/or

+# modify it under the terms of the GNU General Public License

+# as published by the Free Software Foundation; either version 2

+# of the License, or (at your option) any later version.

+#

+# This program is distributed in the hope that it will be useful,

+# but WITHOUT ANY WARRANTY; without even the implied warranty of

+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+# GNU General Public License for more details.

+#

+# You should have received a copy of the GNU General Public License

+# along with this program; if not, write to the Free Software

+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

+

+require File.expand_path('../../../../../test_helper', __FILE__)

+require 'redmine/field_format'

+

+class Redmine::NumericFieldFormatTest < ActionView::TestCase

+  include ApplicationHelper

+

+  def test_integer_field_with_url_pattern_should_format_as_link

+    field = IssueCustomField.new(:field_format => 'int', :url_pattern => 'http://foo/%value%')

+    custom_value = CustomValue.new(:custom_field => field, :customized => Issue.new, :value => "3")

+

+    assert_equal 3, field.format.formatted_custom_value(self, custom_value, false)

+    assert_equal '<a href="http://foo/3">3</a>', field.format.formatted_custom_value(self, custom_value, true)

+  end

+end