| @@ -247,7 +247,7 module ApplicationHelper | |||
|
|
247 | 247 | end |
|
|
248 | 248 | |
|
|
249 | 249 | def format_version_name(version) |
|
|
250 | if version.project == @project | |
|
|
250 | if !version.shared? || version.project == @project | |
|
|
251 | 251 | h(version) |
|
|
252 | 252 | else |
|
|
253 | 253 | h("#{version.project} - #{version}") |
| @@ -226,6 +226,11 class Version < ActiveRecord::Base | |||
|
|
226 | 226 | end |
|
|
227 | 227 | end |
|
|
228 | 228 | |
|
|
229 | # Returns true if the version is shared, otherwise false | |
|
|
230 | def shared? | |
|
|
231 | sharing != 'none' | |
|
|
232 | end | |
|
|
233 | ||
|
|
229 | 234 | private |
|
|
230 | 235 | |
|
|
231 | 236 | def load_issue_counts |
| @@ -816,7 +816,7 class IssuesControllerTest < ActionController::TestCase | |||
|
|
816 | 816 | def test_index_with_fixed_version_column |
|
|
817 | 817 | get :index, :set_filter => 1, :c => %w(fixed_version) |
|
|
818 | 818 | assert_select 'table.issues td.fixed_version' do |
|
|
819 |
assert_select 'a[href=?]', '/versions/2', :text => ' |
|
|
|
819 | assert_select 'a[href=?]', '/versions/2', :text => '1.0' | |
|
|
820 | 820 | end |
|
|
821 | 821 | end |
|
|
822 | 822 | |
| @@ -47,18 +47,18 class ProjectsHelperTest < ActionView::TestCase | |||
|
|
47 | 47 | |
|
|
48 | 48 | def test_link_to_version |
|
|
49 | 49 | User.current = User.find(1) |
|
|
50 |
assert_equal '<a href="/versions/5" title="07/01/2006"> |
|
|
|
50 | assert_equal '<a href="/versions/5" title="07/01/2006">Alpha</a>', link_to_version(Version.find(5)) | |
|
|
51 | 51 | end |
|
|
52 | 52 | |
|
|
53 | 53 | def test_link_to_version_without_effective_date |
|
|
54 | 54 | User.current = User.find(1) |
|
|
55 | 55 | version = Version.find(5) |
|
|
56 | 56 | version.effective_date = nil |
|
|
57 |
assert_equal '<a href="/versions/5"> |
|
|
|
57 | assert_equal '<a href="/versions/5">Alpha</a>', link_to_version(version) | |
|
|
58 | 58 | end |
|
|
59 | 59 | |
|
|
60 | 60 | def test_link_to_private_version |
|
|
61 |
assert_equal ' |
|
|
|
61 | assert_equal 'Alpha', link_to_version(Version.find(5)) | |
|
|
62 | 62 | end |
|
|
63 | 63 | |
|
|
64 | 64 | def test_link_to_version_invalid_version |
| @@ -71,11 +71,20 class ProjectsHelperTest < ActionView::TestCase | |||
|
|
71 | 71 | end |
|
|
72 | 72 | |
|
|
73 | 73 | def test_format_version_name |
|
|
74 |
assert_equal " |
|
|
|
74 | assert_equal "0.1", format_version_name(Version.find(1)) | |
|
|
75 | end | |
|
|
76 | ||
|
|
77 | def test_format_version_name_for_shared_version_within_project_should_not_display_project_name | |
|
|
78 | @project = Project.find(1) | |
|
|
79 | version = Version.find(1) | |
|
|
80 | version.sharing = 'system' | |
|
|
81 | assert_equal "0.1", format_version_name(version) | |
|
|
75 | 82 | end |
|
|
76 | 83 | |
|
|
77 |
def test_format_version_name_for_s |
|
|
|
78 | assert_equal "OnlineStore - Systemwide visible version", format_version_name(Version.find(7)) | |
|
|
84 | def test_format_version_name_for_shared_version_should_display_project_name | |
|
|
85 | version = Version.find(1) | |
|
|
86 | version.sharing = 'system' | |
|
|
87 | assert_equal "eCookbook - 0.1", format_version_name(version) | |
|
|
79 | 88 | end |
|
|
80 | 89 | |
|
|
81 | 90 | def test_version_options_for_select_with_no_versions |
General Comments 0
You need to be logged in to leave comments.
Login now