remove trailing white-spaces from app/models/watcher.rb.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6510 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-08-21 01:59:51 +00:00
parent a20b4c6b23
commit d8cb0855dc
1 changed files with 11 additions and 11 deletions

View File

@ -1,16 +1,16 @@
# redMine - project management software # Redmine - project management software
# Copyright (C) 2006-2007 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.
@ -18,7 +18,7 @@
class Watcher < ActiveRecord::Base class Watcher < ActiveRecord::Base
belongs_to :watchable, :polymorphic => true belongs_to :watchable, :polymorphic => true
belongs_to :user belongs_to :user
validates_presence_of :user validates_presence_of :user
validates_uniqueness_of :user_id, :scope => [:watchable_type, :watchable_id] validates_uniqueness_of :user_id, :scope => [:watchable_type, :watchable_id]
@ -34,25 +34,25 @@ class Watcher < ActiveRecord::Base
pruned pruned
end end
end end
protected protected
def validate def validate
errors.add :user_id, :invalid unless user.nil? || user.active? errors.add :user_id, :invalid unless user.nil? || user.active?
end end
private private
def self.prune_single_user(user, options={}) def self.prune_single_user(user, options={})
return unless user.is_a?(User) return unless user.is_a?(User)
pruned = 0 pruned = 0
find(:all, :conditions => {:user_id => user.id}).each do |watcher| find(:all, :conditions => {:user_id => user.id}).each do |watcher|
next if watcher.watchable.nil? next if watcher.watchable.nil?
if options.has_key?(:project) if options.has_key?(:project)
next unless watcher.watchable.respond_to?(:project) && watcher.watchable.project == options[:project] next unless watcher.watchable.respond_to?(:project) && watcher.watchable.project == options[:project]
end end
if watcher.watchable.respond_to?(:visible?) if watcher.watchable.respond_to?(:visible?)
unless watcher.watchable.visible?(user) unless watcher.watchable.visible?(user)
watcher.destroy watcher.destroy