Mercurial > hg > soundsoftware-site
diff app/models/wiki_page.rb @ 37:94944d00e43c
* Update to SVN trunk rev 4411
author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
---|---|
date | Fri, 19 Nov 2010 13:24:41 +0000 |
parents | 513646585e45 |
children | 051f544170fe |
line wrap: on
line diff
--- a/app/models/wiki_page.rb Fri Sep 24 14:06:04 2010 +0100 +++ b/app/models/wiki_page.rb Fri Nov 19 13:24:41 2010 +0000 @@ -28,7 +28,7 @@ acts_as_event :title => Proc.new {|o| "#{l(:label_wiki)}: #{o.title}"}, :description => :text, :datetime => :created_on, - :url => Proc.new {|o| {:controller => 'wiki', :id => o.wiki.project, :page => o.title}} + :url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.wiki.project, :id => o.title}} acts_as_searchable :columns => ['title', 'text'], :include => [{:wiki => :project}, :content], @@ -139,7 +139,7 @@ parent_page = t.blank? ? nil : self.wiki.find_page(t) self.parent = parent_page end - + protected def validate