|
|
|
@ -88,10 +88,21 @@ module Redmine
|
|
|
|
|
def events_welcome(from = nil, to = nil, options={})
|
|
|
|
|
e = []
|
|
|
|
|
@options[:limit] = options[:limit]
|
|
|
|
|
|
|
|
|
|
@scope.each do |event_type|
|
|
|
|
|
constantized_providers(event_type).each do |provider|
|
|
|
|
|
e += provider.find_events1(event_type, @user, from, to, @options)
|
|
|
|
|
cur_objs = provider.find_events1(event_type, @user, from, to, @options)
|
|
|
|
|
cur_objs.each do |cur_obj|
|
|
|
|
|
if cur_obj.class == Issue
|
|
|
|
|
if cur_obj.project != nil && cur_obj.project.project_status != nil
|
|
|
|
|
e += [cur_obj]
|
|
|
|
|
end
|
|
|
|
|
else
|
|
|
|
|
e += [cur_obj]
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
if e.count > options[:limit]
|
|
|
|
|
break
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|