Fixed Changeset#text_tag for changeset with hash and repository identifier (#13544).
git-svn-id: http://svn.redmine.org/redmine/trunk@12660 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
b25c7003da
commit
5df064ed85
|
@ -154,13 +154,14 @@ class Changeset < ActiveRecord::Base
|
||||||
end
|
end
|
||||||
|
|
||||||
def text_tag(ref_project=nil)
|
def text_tag(ref_project=nil)
|
||||||
tag = if scmid?
|
repo = ""
|
||||||
"commit:#{scmid}"
|
|
||||||
else
|
|
||||||
"r#{revision}"
|
|
||||||
end
|
|
||||||
if repository && repository.identifier.present?
|
if repository && repository.identifier.present?
|
||||||
tag = "#{repository.identifier}|#{tag}"
|
repo = "#{repository.identifier}|"
|
||||||
|
end
|
||||||
|
tag = if scmid?
|
||||||
|
"commit:#{repo}#{scmid}"
|
||||||
|
else
|
||||||
|
"#{repo}r#{revision}"
|
||||||
end
|
end
|
||||||
if ref_project && project && ref_project != project
|
if ref_project && project && ref_project != project
|
||||||
tag = "#{project.identifier}:#{tag}"
|
tag = "#{project.identifier}:#{tag}"
|
||||||
|
|
|
@ -343,6 +343,16 @@ class ChangesetTest < ActiveSupport::TestCase
|
||||||
assert_equal 'commit:0123456789', c.text_tag
|
assert_equal 'commit:0123456789', c.text_tag
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_text_tag_hash_with_repository_identifier
|
||||||
|
r = Repository::Subversion.new(
|
||||||
|
:project_id => 1,
|
||||||
|
:url => 'svn://localhost/test',
|
||||||
|
:identifier => 'documents')
|
||||||
|
c = Changeset.new(:revision => '7234cb27', :scmid => '7234cb27', :repository => r)
|
||||||
|
assert_equal 'commit:documents|7234cb27', c.text_tag
|
||||||
|
assert_equal 'ecookbook:commit:documents|7234cb27', c.text_tag(Project.find(2))
|
||||||
|
end
|
||||||
|
|
||||||
def test_previous
|
def test_previous
|
||||||
changeset = Changeset.find_by_revision('3')
|
changeset = Changeset.find_by_revision('3')
|
||||||
assert_equal Changeset.find_by_revision('2'), changeset.previous
|
assert_equal Changeset.find_by_revision('2'), changeset.previous
|
||||||
|
|
Loading…
Reference in New Issue