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)
+                    if user && project
-                      return false
+                      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

@@ -47,6 +47,20 class Redmine::MenuManager::MenuHelperTest < ActionView::TestCase
47	end	47	end
48	end	48	end
49		49
		50	def test_render_menu_node_with_symbol_as_url
		51	node = Redmine::MenuManager::MenuItem.new(:testing, :issues_path)
		52	@output_buffer = render_menu_node(node, nil)
		53
		54	assert_select "a[href=/issues]", "Testing"
		55	end
		56
		57	def test_render_menu_node_with_symbol_as_url_and_project
		58	node = Redmine::MenuManager::MenuItem.new(:testing, :project_issues_path)
		59	@output_buffer = render_menu_node(node, Project.find(1))
		60
		61	assert_select "a[href=/projects/ecookbook/issues]", "Testing"
		62	end
		63
50	def test_render_menu_node_with_nested_items	64	def test_render_menu_node_with_nested_items
51	parent_node = Redmine::MenuManager::MenuItem.new(:parent_node, '/test', { })	65	parent_node = Redmine::MenuManager::MenuItem.new(:parent_node, '/test', { })
52	parent_node << Redmine::MenuManager::MenuItem.new(:child_one_node, '/test', { })	66	parent_node << Redmine::MenuManager::MenuItem.new(:child_one_node, '/test', { })
@@ -216,6 +230,19 class Redmine::MenuManager::MenuHelperTest < ActionView::TestCase
216	assert_equal 2, items.size	230	assert_equal 2, items.size
217	end	231	end
218		232
		233	def test_menu_items_for_should_skip_items_that_fail_the_permission
		234	menu_name = :test_menu_items_for_should_skip_items_that_fail_the_permission
		235	Redmine::MenuManager.map menu_name do \|menu\|
		236	menu.push(:a_menu, :project_issues_path)
		237	menu.push(:unallowed, :project_issues_path, :permission => :unallowed)
		238	end
		239
		240	User.current = User.find(2)
		241
		242	items = menu_items_for(menu_name, Project.find(1))
		243	assert_equal 1, items.size
		244	end
		245
219	def test_menu_items_for_should_skip_items_that_fail_the_conditions	246	def test_menu_items_for_should_skip_items_that_fail_the_conditions
220	menu_name = :test_menu_items_for_should_skip_items_that_fail_the_conditions	247	menu_name = :test_menu_items_for_should_skip_items_that_fail_the_conditions
221	Redmine::MenuManager.map menu_name do \|menu\|	248	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