meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Don't skip condition if defined (#15880).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@15507 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2016-06-11 07:06:10 +00:00
parent cec8fe4cfa
commit 893c96a990
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/redmine/menu_manager.rb
View File

@ -446,8 +446,7 @@ module Redmine
# it is considered an allowed node if at least one of the children is allowed # it is considered an allowed node if at least one of the children is allowed
all_children = children all_children = children
all_children += child_menus.call(project) if child_menus all_children += child_menus.call(project) if child_menus
return true if all_children.detect{|child| child.allowed?(user, project) } return false unless all_children.detect{|child| child.allowed?(user, project) }
return false
elsif user && project elsif user && project
if permission if permission
unless user.allowed_to?(permission, project) unless user.allowed_to?(permission, project)