Fix wiki links on the activity page. #6746

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4294 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/wiki_content.rb b/app/models/wiki_content.rb
index 1f0eb9a62f8cce300e516287822f8ef52942fdac..68de46654c2262b8b548df3202addba5cd812457 100644 (file)
--- a/app/models/wiki_content.rb
+++ b/app/models/wiki_content.rb
@@ -54,7 +54,7 @@ class WikiContent < ActiveRecord::Base
                   :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, :page => o.page.title, :version => o.version}}
 
     acts_as_activity_provider :type => 'wiki_edits',
                               :timestamp => "#{WikiContent.versioned_table_name}.updated_on",

diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 010a8532c30f4eada0b87ff5e0f2407dacc953a3..d489ec0153ac061bb44bf058771bd9043d43ed33 100644 (file)
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -28,7 +28,7 @@ class WikiPage < ActiveRecord::Base
   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, :page => o.title}}
 
   acts_as_searchable :columns => ['title', 'text'],
                      :include => [{:wiki => :project}, :content],