Mercurial > hg > soundsoftware-site
diff app/models/.svn/text-base/wiki_content.rb.svn-base @ 41:7f0e922c8982 luisf
merged with new version from trunk
author | luisf |
---|---|
date | Fri, 19 Nov 2010 14:45:28 +0000 |
parents | 94944d00e43c |
children | cbce1fd3b1b7 |
line wrap: on
line diff
--- a/app/models/.svn/text-base/wiki_content.rb.svn-base Thu Nov 18 17:50:11 2010 +0000 +++ b/app/models/.svn/text-base/wiki_content.rb.svn-base Fri Nov 19 14:45:28 2010 +0000 @@ -54,7 +54,7 @@ :description => :comments, :datetime => :updated_on, :type => 'wiki-page', - :url => Proc.new {|o| {:controller => 'wiki', :id => o.page.wiki.project_id, :page => o.page.title, :version => o.version}} + :url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.page.wiki.project, :id => o.page.title, :version => o.version}} acts_as_activity_provider :type => 'wiki_edits', :timestamp => "#{WikiContent.versioned_table_name}.updated_on",