diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2010-10-26 15:44:30 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2010-10-26 15:44:30 +0000 |
| commit | 17eab0f5f9ecec337380f3cf8232da2aa32a5d99 (patch) | |
| tree | d86525c224041cf35dbbf15a70889b3353ba0ef3 /app | |
| parent | c399e7632478fbd4ab94a52d68f4b6198142be35 (diff) | |
| download | redmine-17eab0f5f9ecec337380f3cf8232da2aa32a5d99.tar.gz redmine-17eab0f5f9ecec337380f3cf8232da2aa32a5d99.zip | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/wiki_content.rb | 2 | ||||
| -rw-r--r-- | app/models/wiki_page.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/models/wiki_content.rb b/app/models/wiki_content.rb index 1f0eb9a62..68de46654 100644 --- 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 010a8532c..d489ec015 100644 --- 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], |