Merged r14108 (#19348).

git-svn-id: http://svn.redmine.org/redmine/branches/3.0-stable@14109 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c58873c207917d79e4ed154e228932412e1cf20f..7fdb49c07ab8e0c64099ba8824f492a3b3dc2431 100644 (file)
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -240,7 +240,7 @@ module ApplicationHelper
   end
 
   def format_version_name(version)
-    if !version.shared? || version.project == @project
+    if version.project == @project
       h(version)
     else
       h("#{version.project} - #{version}")

diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 3d048edbc8d86089ff490cd6609feaa97e39b9aa..70e74baa5262a0bad22be83412b97137317330fe 100644 (file)
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -849,7 +849,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 => '1.0'
+      assert_select 'a[href=?]', '/versions/2', :text => 'eCookbook - 1.0'
     end
   end
 

diff --git a/test/unit/helpers/projects_helper_test.rb b/test/unit/helpers/projects_helper_test.rb
index 713384527134ecbd01502d8b62c67753bd2ca178..5b7780510fdb52c51e39fe4883a27f54cd22636b 100644 (file)
--- 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 '<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
 
   def test_link_to_version_without_effective_date
     User.current = User.find(1)
     version = Version.find(5)
     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
 
   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
 
   def test_link_to_version_invalid_version
@@ -71,20 +71,11 @@ class ProjectsHelperTest < ActionView::TestCase
   end
 
   def test_format_version_name
-    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)
+    assert_equal "eCookbook - 0.1", format_version_name(Version.find(1))
   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)
+  def test_format_version_name_for_system_version
+    assert_equal "OnlineStore - Systemwide visible version", format_version_name(Version.find(7))
   end
 
   def test_version_options_for_select_with_no_versions