Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-14 17:26:06 +01:00
Code Issues Packages Projects Releases Activity

Restored project name as version prefix when different (#19348).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@14108 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-03-15 14:05:29 +00:00
parent e920e951e7
commit 5c43b4860e
3 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/application_helper.rb
View File

@@ -240,7 +240,7 @@ module ApplicationHelper
end end
def format_version_name(version) def format_version_name(version)
if !version.shared? || version.project == @project if version.project == @project
h(version) h(version)
else else
h("#{version.project} - #{version}") h("#{version.project} - #{version}")

2
test/functional/issues_controller_test.rb
View File

@@ -849,7 +849,7 @@ class IssuesControllerTest < ActionController::TestCase
def test_index_with_fixed_version_column def test_index_with_fixed_version_column
get :index, :set_filter => 1, :c => %w(fixed_version) get :index, :set_filter => 1, :c => %w(fixed_version)
assert_select 'table.issues td.fixed_version' do assert_select 'table.issues td.fixed_version' do
assert_select 'a[href=?]', '/versions/2', :text => '1.0' assert_select 'a[href=?]', '/versions/2', :text => 'eCookbook - 1.0'
end end
end end

21
test/unit/helpers/projects_helper_test.rb
View File

@@ -47,18 +47,18 @@ class ProjectsHelperTest < ActionView::TestCase
def test_link_to_version def test_link_to_version
User.current = User.find(1) User.current = User.find(1)
assert_equal '<a title="07/01/2006" href="/versions/5">Alpha</a>', link_to_version(Version.find(5)) assert_equal '<a title="07/01/2006" href="/versions/5">OnlineStore - Alpha</a>', link_to_version(Version.find(5))
end end
def test_link_to_version_without_effective_date def test_link_to_version_without_effective_date
User.current = User.find(1) User.current = User.find(1)
version = Version.find(5) version = Version.find(5)
version.effective_date = nil version.effective_date = nil
assert_equal '<a href="/versions/5">Alpha</a>', link_to_version(version) assert_equal '<a href="/versions/5">OnlineStore - Alpha</a>', link_to_version(version)
end end
def test_link_to_private_version def test_link_to_private_version
assert_equal 'Alpha', link_to_version(Version.find(5)) assert_equal 'OnlineStore - Alpha', link_to_version(Version.find(5))
end end
def test_link_to_version_invalid_version def test_link_to_version_invalid_version
@@ -71,20 +71,11 @@ class ProjectsHelperTest < ActionView::TestCase
end end
def test_format_version_name def test_format_version_name
assert_equal "0.1", format_version_name(Version.find(1)) assert_equal "eCookbook - 0.1", format_version_name(Version.find(1))
end end
def test_format_version_name_for_shared_version_within_project_should_not_display_project_name def test_format_version_name_for_system_version
@project = Project.find(1) assert_equal "OnlineStore - Systemwide visible version", format_version_name(Version.find(7))
version = Version.find(1)
version.sharing = 'system'
assert_equal "0.1", format_version_name(version)
end
def test_format_version_name_for_shared_version_should_display_project_name
version = Version.find(1)
version.sharing = 'system'
assert_equal "eCookbook - 0.1", format_version_name(version)
end end
def test_version_options_for_select_with_no_versions def test_version_options_for_select_with_no_versions