Merged r4082 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4143 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb
index 100282a7aa910cd273a870a8eab87cfd8950e21a..d0c5dcac1475be74877113fcbdcfad6816533946 100644 (file)
--- a/app/views/versions/index.html.erb
+++ b/app/views/versions/index.html.erb
@@ -51,4 +51,4 @@
 
 <% html_title(l(:label_roadmap)) %>
 
-<%= context_menu :controller => 'issues', :action => 'context_menu' %>
+<%= context_menu issues_context_menu_path %>

diff --git a/test/functional/versions_controller_test.rb b/test/functional/versions_controller_test.rb
index 5fcb1d05a356d5d2694c7e948016f8689bf8b554..f738794ae9c36598921f363b9e7a9aaf7dadc339 100644 (file)
--- a/test/functional/versions_controller_test.rb
+++ b/test/functional/versions_controller_test.rb
@@ -40,6 +40,8 @@ class VersionsControllerTest < ActionController::TestCase
     assert assigns(:versions).include?(Version.find(3))
     # Completed version doesn't appear
     assert !assigns(:versions).include?(Version.find(1))
+    # Context menu on issues
+    assert_select "script", :text => Regexp.new(Regexp.escape("new ContextMenu('/issues/context_menu')"))
   end
   
   def test_index_with_completed_versions