jro_apps/redmine Commit - r3017:174f014564b3

Fixes broken admin menu extension (#4351)....

Jean-Philippe Lang -

r3017:174f014564b3

parent child

Context file:

r3017:174f014564b3

Collapse all files

app/views/admin/index.rhtml +3 -3

             <h2><%=l(:label_administration)%></h2>
             <%= render :partial => 'no_data' if @no_configuration_data %>
             <p class="icon22 icon22-projects">
             <%= link_to l(:label_project_plural), :controller => 'admin', :action => 'projects' %> |
             <%= link_to l(:label_new), :controller => 'projects', :action => 'add' %>
             </p>
             <p class="icon22 icon22-users">
             <%= link_to l(:label_user_plural), :controller => 'users' %> |
             <%= link_to l(:label_new), :controller => 'users', :action => 'add' %>
             </p>
             <p class="icon22 icon22-groups">
             <%= link_to l(:label_group_plural), :controller => 'groups' %> |
             <%= link_to l(:label_new), :controller => 'groups', :action => 'new' %>
             </p>
             <p class="icon22 icon22-role">
             <%= link_to l(:label_role_and_permissions), :controller => 'roles' %>
             </p>
             <p class="icon22 icon22-tracker">
             <%= link_to l(:label_tracker_plural), :controller => 'trackers' %> |
             <%= link_to l(:label_issue_status_plural), :controller => 'issue_statuses' %> |
             <%= link_to l(:label_workflow), :controller => 'workflows', :action => 'edit' %>
             </p>
             <p class="icon22 icon22-workflow">
             <%= link_to l(:label_custom_field_plural), :controller => 'custom_fields' %>
             </p>
             <p class="icon22 icon22-options">
             <%= link_to l(:label_enumerations), :controller => 'enumerations' %>
             </p>
             <p class="icon22 icon22-settings">
             <%= link_to l(:label_settings), :controller => 'settings' %>
             </p>
-            <% menu_items_for(:admin_menu) do |item, caption, url, selected| -%>
+            <% menu_items_for(:admin_menu) do |item| -%>
               <%= content_tag 'p',
-                link_to(h(caption), item.url, item.html_options),
+                link_to(h(item.caption), item.url, item.html_options),
                 :class => ["icon22", "icon22-#{item.name}"].join(' ') %>
             <% end -%>
             <p class="icon22 icon22-plugin">
             <%= link_to l(:label_plugins), :controller => 'admin', :action => 'plugins' %>
             </p>
             <p class="icon22 icon22-info">
             <%= link_to l(:label_information_plural), :controller => 'admin', :action => 'info' %>
             </p>
             <% html_title(l(:label_administration)) -%>

test/functional/admin_controller_test.rb +15 0

             # redMine - project management software
             # Copyright (C) 2006-2007  Jean-Philippe Lang
             #
             # This program is free software; you can redistribute it and/or
             # modify it under the terms of the GNU General Public License
             # as published by the Free Software Foundation; either version 2
             # of the License, or (at your option) any later version.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             require File.dirname(__FILE__) + '/../test_helper'
             require 'admin_controller'
             # Re-raise errors caught by the controller.
             class AdminController; def rescue_action(e) raise e end; end
             class AdminControllerTest < ActionController::TestCase
               fixtures :projects, :users, :roles
               def setup
                 @controller = AdminController.new
                 @request    = ActionController::TestRequest.new
                 @response   = ActionController::TestResponse.new
                 User.current = nil
                 @request.session[:user_id] = 1 # admin
               end
               def test_index
                 get :index
                 assert_no_tag :tag => 'div',
                               :attributes => { :class => /nodata/ }
               end
               def test_projects_routing
                 assert_routing(
                   {:method => :get, :path => '/admin/projects'},
                   :controller => 'admin', :action => 'projects'
                 )
               end
               def test_index_with_no_configuration_data
                 delete_configuration_data
                 get :index
                 assert_tag :tag => 'div',
                            :attributes => { :class => /nodata/ }
               end
               def test_projects
                 get :projects
                 assert_response :success
                 assert_template 'projects'
                 assert_not_nil assigns(:projects)
                 # active projects only
                 assert_nil assigns(:projects).detect {|u| !u.active?}
               end
               def test_projects_with_name_filter
                 get :projects, :name => 'store', :status => ''
                 assert_response :success
                 assert_template 'projects'
                 projects = assigns(:projects)
                 assert_not_nil projects
                 assert_equal 1, projects.size
                 assert_equal 'OnlineStore', projects.first.name
               end
               def test_load_default_configuration_data
                 delete_configuration_data
                 post :default_configuration, :lang => 'fr'
                 assert IssueStatus.find_by_name('Nouveau')
               end
               def test_test_email
                 get :test_email
                 assert_redirected_to '/settings/edit?tab=notifications'
                 mail = ActionMailer::Base.deliveries.last
                 assert_kind_of TMail::Mail, mail
                 user = User.find(1)
                 assert_equal [user.mail], mail.bcc
               end
               def test_no_plugins
                 Redmine::Plugin.clear
                 get :plugins
                 assert_response :success
                 assert_template 'plugins'
               end
               def test_plugins
                 # Register a few plugins
                 Redmine::Plugin.register :foo do
                   name 'Foo plugin'
                   author 'John Smith'
                   description 'This is a test plugin'
                   version '0.0.1'
                   settings :default => {'sample_setting' => 'value', 'foo'=>'bar'}, :partial => 'foo/settings'
                 end
                 Redmine::Plugin.register :bar do
                 end
                 get :plugins
                 assert_response :success
                 assert_template 'plugins'
                 assert_tag :td, :child => { :tag => 'span', :content => 'Foo plugin' }
                 assert_tag :td, :child => { :tag => 'span', :content => 'Bar' }
               end
               def test_info
                 get :info
                 assert_response :success
                 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
                 Role.delete_all('builtin = 0')
                 Tracker.delete_all
                 IssueStatus.delete_all
                 Enumeration.delete_all
               end
             end

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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