From ad73f12a6b24ae4c835187f787672345e636a21e Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Tue, 6 Jul 2010 02:22:03 +0000 Subject: [PATCH] Include visible subprojects when checking for available Activity event types. #5589 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Contributed by Felix Schäfer git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3829 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/activity/fetcher.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/redmine/activity/fetcher.rb b/lib/redmine/activity/fetcher.rb index fb73d5d28..6edc18f3f 100644 --- 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