diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2010-07-06 02:22:03 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2010-07-06 02:22:03 +0000 |
| commit | ad73f12a6b24ae4c835187f787672345e636a21e (patch) | |
| tree | 10d642e9cb4516e9063b688abafcef6cf1b0a0ba /lib/redmine/activity | |
| parent | 56af944afa1406358685a568072bc7eaed5143ef (diff) | |
| download | redmine-ad73f12a6b24ae4c835187f787672345e636a21e.tar.gz redmine-ad73f12a6b24ae4c835187f787672345e636a21e.zip | |
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
Diffstat (limited to 'lib/redmine/activity')
| -rw-r--r-- | lib/redmine/activity/fetcher.rb | 2 |
1 files changed, 1 insertions, 1 deletions
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 |