Include visible subprojects when checking for available Activity event types. #5589

Contributed by Felix Schäfer

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3829 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/activity/fetcher.rb b/lib/redmine/activity/fetcher.rb
index fb73d5d28db987cb1dbadead8cc3d2a9f5a86cda..6edc18f3fc45f1f87326f73e12dae64dd016ca23 100644 (file)
--- a/lib/redmine/activity/fetcher.rb
+++ b/lib/redmine/activity/fetcher.rb
@@ -38,7 +38,7 @@ module Redmine
         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