Add project identifier substitution option to the URL-pattern property of link format custom fields (#15701).
Patch by Mischa The Evil. git-svn-id: http://svn.redmine.org/redmine/trunk@12413 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
3d36b7d91a
commit
a4a91cab7e
|
@ -289,6 +289,7 @@ module Redmine
|
|||
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}
|
||||
if custom_field.regexp.present?
|
||||
url.gsub!(%r{%m(\d+)%}) do
|
||||
m = $1.to_i
|
||||
|
|
|
@ -53,6 +53,19 @@ class Redmine::LinkFieldFormatTest < ActionView::TestCase
|
|||
assert_equal '<a href="http://foo/52">bar</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||||
end
|
||||
|
||||
def test_link_field_should_substitute_project_identifier_in_url
|
||||
project = Project.new
|
||||
project.stubs(:identifier).returns('foo_project-00')
|
||||
object = Issue.new
|
||||
object.stubs(:project).returns(project)
|
||||
|
||||
field = IssueCustomField.new(:field_format => 'link', :url_pattern => 'http://foo/%project_identifier%')
|
||||
custom_value = CustomValue.new(:custom_field => field, :customized => object, :value => "bar")
|
||||
|
||||
assert_equal "bar", field.format.formatted_custom_value(self, custom_value, false)
|
||||
assert_equal '<a href="http://foo/foo_project-00">bar</a>', field.format.formatted_custom_value(self, custom_value, true)
|
||||
end
|
||||
|
||||
def test_link_field_should_substitute_regexp_groups
|
||||
field = IssueCustomField.new(:field_format => 'link', :regexp => /^(.+)-(.+)$/, :url_pattern => 'http://foo/%m2%/%m1%')
|
||||
custom_value = CustomValue.new(:custom_field => field, :customized => Issue.new, :value => "56-142")
|
||||
|
|
Loading…
Reference in New Issue