Fixes broken admin menu extension (#4351).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3131 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/admin/index.rhtml b/app/views/admin/index.rhtml
index 1a0684a1304832e5a3ce93ca42d85558f918557f..3c96a9a0a8785c368dd87f8d5dfa781a95387bad 100644 (file)
--- a/app/views/admin/index.rhtml
+++ b/app/views/admin/index.rhtml
@@ -39,9 +39,9 @@
 <%= link_to l(:label_settings), :controller => 'settings' %>
 </p>
 
-<% menu_items_for(:admin_menu) do |item, caption, url, selected| -%>
-  <%= content_tag 'p', 
-    link_to(h(caption), item.url, item.html_options),
+<% menu_items_for(:admin_menu) do |item| -%>
+  <%= content_tag 'p',
+    link_to(h(item.caption), item.url, item.html_options),
     :class => ["icon22", "icon22-#{item.name}"].join(' ') %>
 <% end -%>
 

diff --git a/test/functional/admin_controller_test.rb b/test/functional/admin_controller_test.rb
index 47091c42f8c405f36fd259b3f11a4e11c89a061e..142a374e9ace57e1695f8d28ca9e53b88762116f 100644 (file)
--- a/test/functional/admin_controller_test.rb
+++ b/test/functional/admin_controller_test.rb
@@ -120,6 +120,21 @@ class AdminControllerTest < ActionController::TestCase
     assert_template 'info'
   end
   
+  def test_admin_menu_plugin_extension
+    Redmine::MenuManager.map :admin_menu do |menu|
+      menu.push :test_admin_menu_plugin_extension, '/foo/bar', :caption => 'Test'
+    end
+    
+    get :index
+    assert_response :success
+    assert_tag :a, :attributes => { :href => '/foo/bar' },
+                   :content => 'Test'
+    
+    Redmine::MenuManager.map :admin_menu do |menu|
+      menu.delete :test_admin_menu_plugin_extension
+    end
+  end
+  
   private
   
   def delete_configuration_data