From 2e04614e218e95672a8e064ed3e5a9f223adc4bf Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Mon, 14 Jul 2014 11:26:29 +0000 Subject: [PATCH] Don't prepend project name if the version is not shared. git-svn-id: http://svn.redmine.org/redmine/trunk@13325 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/application_helper.rb | 2 +- app/models/version.rb | 5 +++++ test/functional/issues_controller_test.rb | 2 +- test/unit/helpers/projects_helper_test.rb | 21 +++++++++++++++------ 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 135551e81..f344f169b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -247,7 +247,7 @@ module ApplicationHelper end def format_version_name(version) - if version.project == @project + if !version.shared? || version.project == @project h(version) else h("#{version.project} - #{version}") diff --git a/app/models/version.rb b/app/models/version.rb index b80f0f2d1..76853e4b0 100644 --- a/app/models/version.rb +++ b/app/models/version.rb @@ -226,6 +226,11 @@ class Version < ActiveRecord::Base end end + # Returns true if the version is shared, otherwise false + def shared? + sharing != 'none' + end + private def load_issue_counts diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb index 77f2ed5a8..9f3542e01 100644 --- a/test/functional/issues_controller_test.rb +++ b/test/functional/issues_controller_test.rb @@ -816,7 +816,7 @@ class IssuesControllerTest < ActionController::TestCase def test_index_with_fixed_version_column get :index, :set_filter => 1, :c => %w(fixed_version) assert_select 'table.issues td.fixed_version' do - assert_select 'a[href=?]', '/versions/2', :text => 'eCookbook - 1.0' + assert_select 'a[href=?]', '/versions/2', :text => '1.0' end end diff --git a/test/unit/helpers/projects_helper_test.rb b/test/unit/helpers/projects_helper_test.rb index a11cc6d9e..b4db5d42f 100644 --- a/test/unit/helpers/projects_helper_test.rb +++ b/test/unit/helpers/projects_helper_test.rb @@ -47,18 +47,18 @@ class ProjectsHelperTest < ActionView::TestCase def test_link_to_version User.current = User.find(1) - assert_equal 'OnlineStore - Alpha', link_to_version(Version.find(5)) + assert_equal 'Alpha', link_to_version(Version.find(5)) end def test_link_to_version_without_effective_date User.current = User.find(1) version = Version.find(5) version.effective_date = nil - assert_equal 'OnlineStore - Alpha', link_to_version(version) + assert_equal 'Alpha', link_to_version(version) end def test_link_to_private_version - assert_equal 'OnlineStore - Alpha', link_to_version(Version.find(5)) + assert_equal 'Alpha', link_to_version(Version.find(5)) end def test_link_to_version_invalid_version @@ -71,11 +71,20 @@ class ProjectsHelperTest < ActionView::TestCase end def test_format_version_name - assert_equal "eCookbook - 0.1", format_version_name(Version.find(1)) + assert_equal "0.1", format_version_name(Version.find(1)) + end + + def test_format_version_name_for_shared_version_within_project_should_not_display_project_name + @project = Project.find(1) + version = Version.find(1) + version.sharing = 'system' + assert_equal "0.1", format_version_name(version) end - def test_format_version_name_for_system_version - assert_equal "OnlineStore - Systemwide visible version", format_version_name(Version.find(7)) + 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 def test_version_options_for_select_with_no_versions -- 2.39.5