From bb36fa5d1208dcf24506e7d5c600443c5b83828d Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sat, 24 Mar 2012 13:03:36 +0000 Subject: [PATCH] Adds the repository identifier to Changeset#text_tag (#779). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9255 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/changeset.rb | 3 +++ test/unit/changeset_test.rb | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/app/models/changeset.rb b/app/models/changeset.rb index a026790b2..645745206 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -157,6 +157,9 @@ class Changeset < ActiveRecord::Base else "r#{revision}" end + if repository && repository.identifier.present? + tag = "#{repository.identifier}|#{tag}" + end if ref_project && project && ref_project != project tag = "#{project.identifier}:#{tag}" end diff --git a/test/unit/changeset_test.rb b/test/unit/changeset_test.rb index a06b1f809..7014eabb7 100644 --- a/test/unit/changeset_test.rb +++ b/test/unit/changeset_test.rb @@ -255,6 +255,17 @@ class ChangesetTest < ActiveSupport::TestCase assert_equal 'ecookbook:r520', c.text_tag(Project.find(2)) end + def test_text_tag_revision_with_repository_identifier + r = Repository::Subversion.create!( + :project_id => 1, + :url => 'svn://localhost/test', + :identifier => 'documents') + + c = Changeset.new(:revision => '520', :repository => r) + assert_equal 'documents|r520', c.text_tag + assert_equal 'ecookbook:documents|r520', c.text_tag(Project.find(2)) + end + def test_text_tag_hash c = Changeset.new( :scmid => '7234cb2750b63f47bff735edc50a1c0a433c2518',