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

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

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6837 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA 2011-08-31 04:09:11 +00:00
parent 7a6bfc4cc5
commit 1fda93a02f
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/models/wiki.rb
View File

@ -1,16 +1,16 @@
# Redmine - project management software # Redmine - project management software
# Copyright (C) 2006-2009 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.
@ -19,29 +19,29 @@ class Wiki < ActiveRecord::Base
belongs_to :project belongs_to :project
has_many :pages, :class_name => 'WikiPage', :dependent => :destroy, :order => 'title' has_many :pages, :class_name => 'WikiPage', :dependent => :destroy, :order => 'title'
has_many :redirects, :class_name => 'WikiRedirect', :dependent => :delete_all has_many :redirects, :class_name => 'WikiRedirect', :dependent => :delete_all
acts_as_watchable acts_as_watchable
validates_presence_of :start_page validates_presence_of :start_page
validates_format_of :start_page, :with => /^[^,\.\/\?\;\|\:]*$/ validates_format_of :start_page, :with => /^[^,\.\/\?\;\|\:]*$/
def visible?(user=User.current) def visible?(user=User.current)
!user.nil? && user.allowed_to?(:view_wiki_pages, project) !user.nil? && user.allowed_to?(:view_wiki_pages, project)
end end
# Returns the wiki page that acts as the sidebar content # Returns the wiki page that acts as the sidebar content
# or nil if no such page exists # or nil if no such page exists
def sidebar def sidebar
@sidebar ||= find_page('Sidebar', :with_redirect => false) @sidebar ||= find_page('Sidebar', :with_redirect => false)
end end
# find the page with the given title # find the page with the given title
# if page doesn't exist, return a new page # if page doesn't exist, return a new page
def find_or_new_page(title) def find_or_new_page(title)
title = start_page if title.blank? title = start_page if title.blank?
find_page(title) || WikiPage.new(:wiki => self, :title => Wiki.titleize(title)) find_page(title) || WikiPage.new(:wiki => self, :title => Wiki.titleize(title))
end end
# find the page with the given title # find the page with the given title
def find_page(title, options = {}) def find_page(title, options = {})
@page_found_with_redirect = false @page_found_with_redirect = false
@ -58,7 +58,7 @@ class Wiki < ActiveRecord::Base
end end
page page
end end
# Returns true if the last page was found with a redirect # Returns true if the last page was found with a redirect
def page_found_with_redirect? def page_found_with_redirect?
@page_found_with_redirect @page_found_with_redirect
@ -82,7 +82,7 @@ class Wiki < ActiveRecord::Base
end end
end end
end end
# turn a string into a valid page title # turn a string into a valid page title
def self.titleize(title) def self.titleize(title)
# replace spaces with _ and remove unwanted caracters # replace spaces with _ and remove unwanted caracters
@ -90,5 +90,5 @@ class Wiki < ActiveRecord::Base
# upcase the first letter # upcase the first letter
title = (title.slice(0..0).upcase + (title.slice(1..-1) || '')) if title title = (title.slice(0..0).upcase + (title.slice(1..-1) || '')) if title
title title
end end
end end