From: Toshi MARUYAMA Date: Thu, 1 Sep 2011 02:08:09 +0000 (+0000) Subject: remove trailing white-spaces from lib/redmine/activity/fetcher.rb. X-Git-Tag: 1.3.0~1007 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=44be7d1a46b6f148c8e5b6e865dc6c41c06ae246;p=redmine.git remove trailing white-spaces from lib/redmine/activity/fetcher.rb. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6956 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/lib/redmine/activity/fetcher.rb b/lib/redmine/activity/fetcher.rb index 6edc18f3f..b8dde08e3 100644 --- a/lib/redmine/activity/fetcher.rb +++ b/lib/redmine/activity/fetcher.rb @@ -1,16 +1,16 @@ # Redmine - project management software -# Copyright (C) 2006-2008 Jean-Philippe Lang +# Copyright (C) 2006-2011 Jean-Philippe Lang # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. @@ -20,33 +20,33 @@ module Redmine # Class used to retrieve activity events class Fetcher attr_reader :user, :project, :scope - + # Needs to be unloaded in development mode @@constantized_providers = Hash.new {|h,k| h[k] = Redmine::Activity.providers[k].collect {|t| t.constantize } } - + def initialize(user, options={}) options.assert_valid_keys(:project, :with_subprojects, :author) @user = user @project = options[:project] @options = options - + @scope = event_types end - + # Returns an array of available event types def event_types return @event_types unless @event_types.nil? - + @event_types = Redmine::Activity.available_event_types @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 - + # Yields to filter the activity scope def scope_select(&block) @scope = @scope.select {|t| yield t } end - + # Sets the scope # Argument can be :all, :default or an array of event types def scope=(s) @@ -59,34 +59,34 @@ module Redmine @scope = s & event_types end end - + # Resets the scope to the default scope def default_scope! @scope = Redmine::Activity.default_event_types end - + # Returns an array of events for the given date range # sorted in reverse chronological order def events(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_events(event_type, @user, from, to, @options) end end - + e.sort! {|a,b| b.event_datetime <=> a.event_datetime} - + if options[:limit] e = e.slice(0, options[:limit]) end e end - + private - + def constantized_providers(event_type) @@constantized_providers[event_type] end