remove trailing white-spaces from WikiContent model source.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5795 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-05-16 00:00:26 +00:00
parent 674a61dc8e
commit 97abb12aeb
1 changed files with 15 additions and 15 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.
@ -23,28 +23,28 @@ class WikiContent < ActiveRecord::Base
belongs_to :author, :class_name => 'User', :foreign_key => 'author_id' belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
validates_presence_of :text validates_presence_of :text
validates_length_of :comments, :maximum => 255, :allow_nil => true validates_length_of :comments, :maximum => 255, :allow_nil => true
acts_as_versioned acts_as_versioned
def visible?(user=User.current) def visible?(user=User.current)
page.visible?(user) page.visible?(user)
end end
def project def project
page.project page.project
end end
def attachments def attachments
page.nil? ? [] : page.attachments page.nil? ? [] : page.attachments
end end
# Returns the mail adresses of users that should be notified # Returns the mail adresses of users that should be notified
def recipients def recipients
notified = project.notified_users notified = project.notified_users
notified.reject! {|user| !visible?(user)} notified.reject! {|user| !visible?(user)}
notified.collect(&:mail) notified.collect(&:mail)
end end
class Version class Version
belongs_to :page, :class_name => '::WikiPage', :foreign_key => 'page_id' belongs_to :page, :class_name => '::WikiPage', :foreign_key => 'page_id'
belongs_to :author, :class_name => '::User', :foreign_key => 'author_id' belongs_to :author, :class_name => '::User', :foreign_key => 'author_id'
@ -84,7 +84,7 @@ class WikiContent < ActiveRecord::Base
end end
plain plain
end end
def text def text
@text ||= case compression @text ||= case compression
when 'gzip' when 'gzip'
@ -92,16 +92,16 @@ class WikiContent < ActiveRecord::Base
else else
# uncompressed data # uncompressed data
data data
end end
end end
def project def project
page.project page.project
end end
# Returns the previous version or nil # Returns the previous version or nil
def previous def previous
@previous ||= WikiContent::Version.find(:first, @previous ||= WikiContent::Version.find(:first,
:order => 'version DESC', :order => 'version DESC',
:include => :author, :include => :author,
:conditions => ["wiki_content_id = ? AND version < ?", wiki_content_id, version]) :conditions => ["wiki_content_id = ? AND version < ?", wiki_content_id, version])