Fixes Changeset#text_tag for numeric scmid (#6681).

Contributed by Toshi MARUYAMA.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4490 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 29679fa7b3c375a458a36c4eff252948a0a0aef0..804719481e210d235f3f146f03e089bb953b7956 100644 (file)
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -126,11 +126,10 @@ class Changeset < ActiveRecord::Base
   end
 
   def text_tag
-    c = scmid? ? scmid : revision
-    if c.to_s =~ /^[0-9]*$/
-      "r#{c}"
+    if scmid?
+      "commit:#{scmid}"
     else
-      "commit:#{c}"
+      "r#{revision}"
     end
   end
   

diff --git a/test/unit/changeset_test.rb b/test/unit/changeset_test.rb
index 612a4299bea8c4fc3fd07931b46d76b5df431f7d..47f5d5fc48b7bc1c1cb048d0a1522e4e89630129 100644 (file)
--- a/test/unit/changeset_test.rb
+++ b/test/unit/changeset_test.rb
@@ -75,7 +75,6 @@ class ChangesetTest < ActiveSupport::TestCase
     c = Changeset.new(:repository => Project.find(1).repository,
                       :committed_on => 24.hours.ago,
                       :comments => 'Worked on this issue #1 @2h',
-                      :scmid => '520',
                       :revision => '520',
                       :user => User.find(2))
     assert_difference 'TimeEntry.count' do
@@ -171,8 +170,8 @@ class ChangesetTest < ActiveSupport::TestCase
     assert c.issues.first.project != c.project
   end
   
-  def test_text_tag_numeric
-    c = Changeset.new(:scmid => '520', :revision => '520')
+  def test_text_tag_revision
+    c = Changeset.new(:revision => '520')
     assert_equal 'r520', c.text_tag
   end
   
@@ -181,6 +180,11 @@ class ChangesetTest < ActiveSupport::TestCase
     assert_equal 'commit:7234cb2750b63f47bff735edc50a1c0a433c2518', c.text_tag
   end
 
+  def test_text_tag_hash_all_number
+    c = Changeset.new(:scmid => '0123456789', :revision => '0123456789')
+    assert_equal 'commit:0123456789', c.text_tag
+  end
+
   def test_previous
     changeset = Changeset.find_by_revision('3')
     assert_equal Changeset.find_by_revision('2'), changeset.previous