Mercurial > hg > soundsoftware-site
diff app/models/wiki.rb @ 931:ec1c49528f36 cannam_integration
Merge from branch "redmine-1.3"
author | Chris Cannam |
---|---|
date | Wed, 27 Jun 2012 15:04:58 +0100 |
parents | 5e80956cc792 5f33065ddc4b |
children | bb32da3bea34 |
line wrap: on
line diff
--- a/app/models/wiki.rb Wed Jun 27 14:56:14 2012 +0100 +++ b/app/models/wiki.rb Wed Jun 27 15:04:58 2012 +0100 @@ -16,6 +16,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class Wiki < ActiveRecord::Base + include Redmine::SafeAttributes belongs_to :project has_many :pages, :class_name => 'WikiPage', :dependent => :destroy, :order => 'title' has_many :redirects, :class_name => 'WikiRedirect', :dependent => :delete_all @@ -25,6 +26,8 @@ validates_presence_of :start_page validates_format_of :start_page, :with => /^[^,\.\/\?\;\|\:]*$/ + safe_attributes 'start_page' + def visible?(user=User.current) !user.nil? && user.allowed_to?(:view_wiki_pages, project) end