kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged r8804 from trunk.

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.3-stable@9113 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2012-03-05 12:46:41 +00:00
parent 92dde0d75f
commit 39af3f1b79
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/project.rb
View File

@ -253,7 +253,7 @@ class Project < ActiveRecord::Base
def to_param
# id is used for projects with a numeric identifier (compatibility)
@to_param ||= (identifier.to_s =~ %r{^\d*$} ? id : identifier)
@to_param ||= (identifier.to_s =~ %r{^\d*$} ? id.to_s : identifier)
end
def active?

8
test/unit/helpers/application_helper_test.rb
View File

@ -925,6 +925,14 @@ RAW
link_to_project(project, {:action => 'settings'}, :class => "project")
end
def test_link_to_legacy_project_with_numerical_identifier_should_use_id
# numeric identifier are no longer allowed
Project.update_all "identifier=25", "id=1"
assert_equal '<a href="/projects/1">eCookbook</a>',
link_to_project(Project.find(1))
end
def test_principals_options_for_select_with_users
users = [User.find(2), User.find(4)]
assert_equal %(<option value="2">John Smith</option><option value="4">Robert Hill</option>),