Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-24 05:10:44 +01:00
Code Issues Packages Projects Releases Activity

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

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@13765 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2014-12-14 21:46:53 +00:00
parent cb3676a553
commit 64fea07aff
3 changed files with 47 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/redmine/menu_manager.rb
View File

@@ -178,7 +178,11 @@ module Redmine
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
@@ -376,9 +380,9 @@ module Redmine
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
@@ -386,6 +390,8 @@ module Redmine
@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] || {}
@@ -423,11 +429,19 @@ module Redmine
# 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