##// END OF EJS Templates
jro_apps » redmine
RSS
Fix wiki links on the activity page. #6746...
Eric Davis -
r4180:17eab0f5f9ec
parent child
Show More
Side by Side Unified
Context file:
r4180:17eab0f5f9ec Loading diff...:
Show file before | Show file after | Hide comments
@@ -54,7 +54,7 class WikiContent < ActiveRecord::Base
54 :description => :comments,
54 :description => :comments,
55 :datetime => :updated_on,
55 :datetime => :updated_on,
56 :type => 'wiki-page',
56 :type => 'wiki-page',
57 :url => Proc.new {|o| {:controller => 'wiki', :id => o.page.wiki.project_id, :page => o.page.title, :version => o.version}}
57 :url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.page.wiki.project, :page => o.page.title, :version => o.version}}
58
58
59 acts_as_activity_provider :type => 'wiki_edits',
59 acts_as_activity_provider :type => 'wiki_edits',
60 :timestamp => "#{WikiContent.versioned_table_name}.updated_on",
60 :timestamp => "#{WikiContent.versioned_table_name}.updated_on",
Show file before | Show file after | Hide comments
@@ -28,7 +28,7 class WikiPage < ActiveRecord::Base
28 acts_as_event :title => Proc.new {|o| "#{l(:label_wiki)}: #{o.title}"},
28 acts_as_event :title => Proc.new {|o| "#{l(:label_wiki)}: #{o.title}"},
29 :description => :text,
29 :description => :text,
30 :datetime => :created_on,
30 :datetime => :created_on,
31 :url => Proc.new {|o| {:controller => 'wiki', :id => o.wiki.project, :page => o.title}}
31 :url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.wiki.project, :page => o.title}}
32
32
33 acts_as_searchable :columns => ['title', 'text'],
33 acts_as_searchable :columns => ['title', 'text'],
34 :include => [{:wiki => :project}, :content],
34 :include => [{:wiki => :project}, :content],
General Comments 0
You need to be logged in to leave comments. Login now