kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Toshi MARUYAMA 2011-09-01 02:08:09 +00:00
parent 28c4e0494e
commit 44be7d1a46
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/redmine/activity/fetcher.rb
View File

@ -1,16 +1,16 @@
# Redmine - project management software # 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 # This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License # modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2 # as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version. # of the License, or (at your option) any later version.
# #
# This program is distributed in the hope that it will be useful, # This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of # but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details. # GNU General Public License for more details.
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software # along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # 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 used to retrieve activity events
class Fetcher class Fetcher
attr_reader :user, :project, :scope attr_reader :user, :project, :scope
# Needs to be unloaded in development mode # Needs to be unloaded in development mode
@@constantized_providers = Hash.new {|h,k| h[k] = Redmine::Activity.providers[k].collect {|t| t.constantize } } @@constantized_providers = Hash.new {|h,k| h[k] = Redmine::Activity.providers[k].collect {|t| t.constantize } }
def initialize(user, options={}) def initialize(user, options={})
options.assert_valid_keys(:project, :with_subprojects, :author) options.assert_valid_keys(:project, :with_subprojects, :author)
@user = user @user = user
@project = options[:project] @project = options[:project]
@options = options @options = options
@scope = event_types @scope = event_types
end end
# Returns an array of available event types # Returns an array of available event types
def event_types def event_types
return @event_types unless @event_types.nil? return @event_types unless @event_types.nil?
@event_types = Redmine::Activity.available_event_types @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 = @event_types.select {|o| @project.self_and_descendants.detect {|p| @user.allowed_to?("view_#{o}".to_sym, p)}} if @project
@event_types @event_types
end end
# Yields to filter the activity scope # Yields to filter the activity scope
def scope_select(&block) def scope_select(&block)
@scope = @scope.select {|t| yield t } @scope = @scope.select {|t| yield t }
end end
# Sets the scope # Sets the scope
# Argument can be :all, :default or an array of event types # Argument can be :all, :default or an array of event types
def scope=(s) def scope=(s)
@ -59,34 +59,34 @@ module Redmine
@scope = s & event_types @scope = s & event_types
end end
end end
# Resets the scope to the default scope # Resets the scope to the default scope
def default_scope! def default_scope!
@scope = Redmine::Activity.default_event_types @scope = Redmine::Activity.default_event_types
end end
# Returns an array of events for the given date range # Returns an array of events for the given date range
# sorted in reverse chronological order # sorted in reverse chronological order
def events(from = nil, to = nil, options={}) def events(from = nil, to = nil, options={})
e = [] e = []
@options[:limit] = options[:limit] @options[:limit] = options[:limit]
@scope.each do |event_type| @scope.each do |event_type|
constantized_providers(event_type).each do |provider| constantized_providers(event_type).each do |provider|
e += provider.find_events(event_type, @user, from, to, @options) e += provider.find_events(event_type, @user, from, to, @options)
end end
end end
e.sort! {|a,b| b.event_datetime <=> a.event_datetime} e.sort! {|a,b| b.event_datetime <=> a.event_datetime}
if options[:limit] if options[:limit]
e = e.slice(0, options[:limit]) e = e.slice(0, options[:limit])
end end
e e
end end
private private
def constantized_providers(event_type) def constantized_providers(event_type)
@@constantized_providers[event_type] @@constantized_providers[event_type]
end end