possibly use the activity permissions in the fetcher to find visible event types

This commit is contained in:
Tim Felgentreff 2010-07-29 11:31:06 +02:00
parent d34abea14e
commit 75024acf5a
1 changed files with 9 additions and 1 deletions

View File

@ -38,7 +38,15 @@ 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 do |o|
permissions = constantized_providers(o).collect do |p|
p.activity_provider_options[o].try(:[], :permission)
end.compact
if @project
return @user.allowed_to?("view_#{o}".to_sym, @project) if permissions.blank?
permissions.all? {|p| @user.allowed_to?(p, @project) } if @project
end
end
@event_types
end