comparison app/models/wiki_content.rb @ 1298:4f746d8966dd redmine_2.3_integration

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration
author Chris Cannam
date Fri, 14 Jun 2013 09:28:30 +0100
parents 622f24f53b42
children
comparison
equal deleted inserted replaced
1297:0a574315af3e 1298:4f746d8966dd
1 # Redmine - project management software 1 # Redmine - project management software
2 # Copyright (C) 2006-2012 Jean-Philippe Lang 2 # Copyright (C) 2006-2013 Jean-Philippe Lang
3 # 3 #
4 # This program is free software; you can redistribute it and/or 4 # This program is free software; you can redistribute it and/or
5 # modify it under the terms of the GNU General Public License 5 # modify it under the terms of the GNU General Public License
6 # as published by the Free Software Foundation; either version 2 6 # as published by the Free Software Foundation; either version 2
7 # of the License, or (at your option) any later version. 7 # of the License, or (at your option) any later version.
57 57
58 acts_as_event :title => Proc.new {|o| "#{l(:label_wiki_edit)}: #{o.page.title} (##{o.version})"}, 58 acts_as_event :title => Proc.new {|o| "#{l(:label_wiki_edit)}: #{o.page.title} (##{o.version})"},
59 :description => :comments, 59 :description => :comments,
60 :datetime => :updated_on, 60 :datetime => :updated_on,
61 :type => 'wiki-page', 61 :type => 'wiki-page',
62 :group => :page,
62 :url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.page.wiki.project, :id => o.page.title, :version => o.version}} 63 :url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.page.wiki.project, :id => o.page.title, :version => o.version}}
63 64
64 acts_as_activity_provider :type => 'wiki_edits', 65 acts_as_activity_provider :type => 'wiki_edits',
65 :timestamp => "#{WikiContent.versioned_table_name}.updated_on", 66 :timestamp => "#{WikiContent.versioned_table_name}.updated_on",
66 :author_key => "#{WikiContent.versioned_table_name}.author_id", 67 :author_key => "#{WikiContent.versioned_table_name}.author_id",