| @@ -19,6 +19,14 | |||
|
|
19 | 19 | |
|
|
20 | 20 | module VersionsHelper |
|
|
21 | 21 | |
|
|
22 | def version_anchor(version) | |
|
|
23 | if @project == version.project | |
|
|
24 | anchor version.name | |
|
|
25 | else | |
|
|
26 | anchor "#{version.project.try(:identifier)}-#{version.name}" | |
|
|
27 | end | |
|
|
28 | end | |
|
|
29 | ||
|
|
22 | 30 | STATUS_BY_CRITERIAS = %w(tracker status priority author assigned_to category) |
|
|
23 | 31 | |
|
|
24 | 32 | def render_issue_status_by(version, criteria) |
| @@ -9,7 +9,7 | |||
|
|
9 | 9 | <% else %> |
|
|
10 | 10 | <div id="roadmap"> |
|
|
11 | 11 | <% @versions.each do |version| %> |
|
|
12 |
<h3 class="version"><%= link_to_version version, :name => anchor(version |
|
|
|
12 | <h3 class="version"><%= link_to_version version, :name => version_anchor(version) %></h3> | |
|
|
13 | 13 | <%= render :partial => 'versions/overview', :locals => {:version => version} %> |
|
|
14 | 14 | <%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %> |
|
|
15 | 15 | |
| @@ -49,7 +49,7 | |||
|
|
49 | 49 | |
|
|
50 | 50 | <h3><%= l(:label_version_plural) %></h3> |
|
|
51 | 51 | <% @versions.each do |version| %> |
|
|
52 |
<%= link_to format_version_name(version), "##{anchor(version |
|
|
|
52 | <%= link_to format_version_name(version), "##{version_anchor(version)}" %><br /> | |
|
|
53 | 53 | <% end %> |
|
|
54 | 54 | <% if @completed_versions.present? %> |
|
|
55 | 55 | <p> |
| @@ -80,6 +80,20 class VersionsControllerTest < ActionController::TestCase | |||
|
|
80 | 80 | assert assigns(:versions).include?(@subproject_version), "Subproject version not found" |
|
|
81 | 81 | end |
|
|
82 | 82 | |
|
|
83 | def test_index_should_prepend_shared_versions | |
|
|
84 | get :index, :project_id => 1 | |
|
|
85 | assert_response :success | |
|
|
86 | ||
|
|
87 | assert_select '#sidebar' do | |
|
|
88 | assert_select 'a[href=?]', '#2.0', :text => '2.0' | |
|
|
89 | assert_select 'a[href=?]', '#subproject1-2.0', :text => 'eCookbook Subproject 1 - 2.0' | |
|
|
90 | end | |
|
|
91 | assert_select '#content' do | |
|
|
92 | assert_select 'a[name=?]', '2.0', :text => '2.0' | |
|
|
93 | assert_select 'a[name=?]', 'subproject1-2.0', :text => 'eCookbook Subproject 1 - 2.0' | |
|
|
94 | end | |
|
|
95 | end | |
|
|
96 | ||
|
|
83 | 97 | def test_show |
|
|
84 | 98 | get :show, :id => 2 |
|
|
85 | 99 | assert_response :success |
General Comments 0
You need to be logged in to leave comments.
Login now