jro_apps/redmine Commit - r12972:2e04614e218e

Don't prepend project name if the version is not shared....

Jean-Philippe Lang -

r12972:2e04614e218e

parent child

Context file:

r12972:2e04614e218e

Collapse all files

app/helpers/application_helper.rb +1 -1

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

app/models/version.rb +5 0

                 end
               end
+              # Returns true if the version is shared, otherwise false
+              def shared?
+                sharing != 'none'
+              end
               private
               def load_issue_counts

test/functional/issues_controller_test.rb +1 -1

               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

test/unit/helpers/projects_helper_test.rb +15 -6

               def test_link_to_version
                 User.current = User.find(1)
-                assert_equal '<a href="/versions/5" title="07/01/2006">OnlineStore - Alpha</a>', link_to_version(Version.find(5))
+                assert_equal '<a href="/versions/5" title="07/01/2006">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">OnlineStore - Alpha</a>', link_to_version(version)
+                assert_equal '<a href="/versions/5">Alpha</a>', 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
               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
+              def test_format_version_name_for_shared_version_should_display_project_name
-                assert_equal "OnlineStore - Systemwide visible version", format_version_name(Version.find(7))
+                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

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages