Permalink
Browse files

Include visible subprojects when checking for available Activity even…

…t types. #5589

Contributed by Felix Schäfer

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3829 e93f8b46-1217-0410-a6f0-8f06a7374b81
  • Loading branch information...
1 parent 56af944 commit ad73f12a6b24ae4c835187f787672345e636a21e @edavis10 edavis10 committed Jul 6, 2010
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/redmine/activity/fetcher.rb
@@ -38,7 +38,7 @@ def event_types
return @event_types unless @event_types.nil?
@event_types = Redmine::Activity.available_event_types
- @event_types = @event_types.select {|o| @user.allowed_to?("view_#{o}".to_sym, @project)} if @project
+ @event_types = @event_types.select {|o| @project.self_and_descendants.detect {|p| @user.allowed_to?("view_#{o}".to_sym, p)}} if @project
@event_types
end

0 comments on commit ad73f12

Please sign in to comment.