diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-10-22 17:37:16 +0000 |
| commit | 2d1866d966d94c688f9cb87c5bf3f096dffac844 (patch) | |
| tree | 7a733c1cc51448ab69b3f892285305dbfb0ae15e /app/models/wiki.rb | |
| parent | a6ec78a4dc658e3517ed682792016b6530458696 (diff) | |
| download | redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.tar.gz redmine-2d1866d966d94c688f9cb87c5bf3f096dffac844.zip | |
Merged rails-4.1 branch (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13482 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/wiki.rb')
| -rw-r--r-- | app/models/wiki.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/models/wiki.rb b/app/models/wiki.rb index 45a22fda1..b1ce29743 100644 --- a/app/models/wiki.rb +++ b/app/models/wiki.rb @@ -18,13 +18,14 @@ class Wiki < ActiveRecord::Base include Redmine::SafeAttributes belongs_to :project - has_many :pages, :class_name => 'WikiPage', :dependent => :destroy, :order => 'title' + has_many :pages, lambda {order('title')}, :class_name => 'WikiPage', :dependent => :destroy has_many :redirects, :class_name => 'WikiRedirect', :dependent => :delete_all acts_as_watchable validates_presence_of :start_page validates_format_of :start_page, :with => /\A[^,\.\/\?\;\|\:]*\z/ + attr_protected :id safe_attributes 'start_page' |