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

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
17eab0f5 · Eric Davis · c399e763 · 17eab0f5 · 17eab0f5
Commit 17eab0f5 authored Oct 26, 2010 by Eric Davis
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

wiki_content.rb app/models/wiki_content.rb +1 -1

wiki_page.rb app/models/wiki_page.rb +1 -1

No files found.
--- 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",

--- 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],