jro_apps/redmine Commit - r13383:64fea07affaf

Support for named route in project menu and a new :permission option (#6426)....

Jean-Philippe Lang -

r13383:64fea07affaf

parent child

Context file:

r13383:64fea07affaf

Collapse all files

lib/redmine/menu_manager.rb +20 -6

                      when Hash
                        project.nil? ? item.url : {item.param => project}.merge(item.url)
                      when Symbol
-                       send(item.url)
+                       if project
+                         send(item.url, project)
+                       else
+                         send(item.url)
+                       end
                      else
                        item.url
                      end
                  class MenuItem < MenuNode
                    include Redmine::I18n
-                   attr_reader :name, :url, :param, :condition, :parent, :child_menus, :last
+                   attr_reader :name, :url, :param, :condition, :parent, :child_menus, :last, :permission
-                   def initialize(name, url, options)
+                   def initialize(name, url, options={})
                      raise ArgumentError, "Invalid option :if for menu item '#{name}'" if options[:if] && !options[:if].respond_to?(:call)
                      raise ArgumentError, "Invalid option :html for menu item '#{name}'" if options[:html] && !options[:html].is_a?(Hash)
                      raise ArgumentError, "Cannot set the :parent to be the same as this item" if options[:parent] == name.to_sym
                      @name = name
                      @url = url
                      @condition = options[:if]
+                     @permission = options[:permission]
+                     @permission ||= false if options.key?(:permission)
                      @param = options[:param] || :id
                      @caption = options[:caption]
                      @html_options = options[:html] || {}
                    # Checks if a user is allowed to access the menu item by:
                    #
-                   # * Checking the url target (project only)
+                   # * Checking the permission or the url target (project only)
                    # * Checking the conditions of the item
                    def allowed?(user, project)
-                     if url.is_a?(Hash) && project && user && !user.allowed_to?(url, project)
-                       return false
+                     if user && project
+                       if permission
+                         unless user.allowed_to?(permission, project)
+                           return false
+                         end
+                       elsif permission.nil? && url.is_a?(Hash)
+                         unless user.allowed_to?(url, project)
+                           return false
+                         end
+                       end
                      end
                      if condition && !condition.call(project)
                        # Condition that doesn't pass

test/unit/lib/redmine/menu_manager/menu_helper_test.rb +27 0

                  end
                end
+               def test_render_menu_node_with_symbol_as_url
+                 node = Redmine::MenuManager::MenuItem.new(:testing, :issues_path)
+                 @output_buffer = render_menu_node(node, nil)
+                 assert_select "a[href=/issues]", "Testing"
+               end
+               def test_render_menu_node_with_symbol_as_url_and_project
+                 node = Redmine::MenuManager::MenuItem.new(:testing, :project_issues_path)
+                 @output_buffer = render_menu_node(node, Project.find(1))
+                 assert_select "a[href=/projects/ecookbook/issues]", "Testing"
+               end
                def test_render_menu_node_with_nested_items
                  parent_node = Redmine::MenuManager::MenuItem.new(:parent_node, '/test', { })
                  parent_node << Redmine::MenuManager::MenuItem.new(:child_one_node, '/test', { })
                  assert_equal 2, items.size
                end
+               def test_menu_items_for_should_skip_items_that_fail_the_permission
+                 menu_name = :test_menu_items_for_should_skip_items_that_fail_the_permission
+                 Redmine::MenuManager.map menu_name do |menu|
+                   menu.push(:a_menu, :project_issues_path)
+                   menu.push(:unallowed, :project_issues_path, :permission => :unallowed)
+                 end
+                 User.current = User.find(2)
+                 items = menu_items_for(menu_name, Project.find(1))
+                 assert_equal 1, items.size
+               end
                def test_menu_items_for_should_skip_items_that_fail_the_conditions
                  menu_name = :test_menu_items_for_should_skip_items_that_fail_the_conditions
                  Redmine::MenuManager.map menu_name do |menu|

test/unit/lib/redmine/menu_manager/menu_item_test.rb 0 -6

                  end
                end
-               def test_new_menu_item_should_require_the_options
-                 assert_raises ArgumentError do
-                   Redmine::MenuManager::MenuItem.new(:test_missing_options, '/test')
-                 end
-               end
                def test_new_menu_item_with_all_required_parameters
                  assert Redmine::MenuManager::MenuItem.new(:test_good_menu, '/test', {})
                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