jro_apps/redmine Commit - r10017:861ca7817986

Fixed that roadmap anchor links can be ambigous (#11540)....

Jean-Philippe Lang -

r10017:861ca7817986

parent child

Context file:

r10017:861ca7817986

app/helpers/versions_helper.rb +8 0

             module VersionsHelper
+              def version_anchor(version)
+                if @project == version.project
+                  anchor version.name
+                else
+                  anchor "#{version.project.try(:identifier)}-#{version.name}"
+                end
+              end
               STATUS_BY_CRITERIAS = %w(tracker status priority author assigned_to category)
               def render_issue_status_by(version, criteria)

app/views/versions/index.html.erb +2 -2

             <% else %>
             <div id="roadmap">
             <% @versions.each do |version| %>
-                <h3 class="version"><%= link_to_version version, :name => anchor(version.name) %></h3>
+                <h3 class="version"><%= link_to_version version, :name => version_anchor(version) %></h3>
                 <%= render :partial => 'versions/overview', :locals => {:version => version} %>
                 <%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>
             <h3><%= l(:label_version_plural) %></h3>
             <% @versions.each do |version| %>
-            <%= link_to format_version_name(version), "##{anchor(version.name)}" %><br />
+            <%= link_to format_version_name(version), "##{version_anchor(version)}" %><br />
             <% end %>
             <% if @completed_versions.present? %>
             <p>

test/functional/versions_controller_test.rb +14 0

@@ -80,6 +80,20 class VersionsControllerTest < ActionController::TestCase
80	assert assigns(:versions).include?(@subproject_version), "Subproject version not found"	80	assert assigns(:versions).include?(@subproject_version), "Subproject version not found"
81	end	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	def test_show	97	def test_show
84	get :show, :id => 2	98	get :show, :id => 2
85	assert_response :success	99	assert_response :success

General Comments 0

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

No TODOs yet

	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