diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-09-13 16:45:01 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-09-13 16:45:01 +0000 |
| commit | 455abea32042a9e612b72cdf88d158fa72cb7144 (patch) | |
| tree | 4c1f313ed96bcf98817840520160cea1ad86b13e /app/models/wiki_content.rb | |
| parent | cc643ce932b2abdc56c4d1933c02806ca57ddefa (diff) | |
| download | redmine-455abea32042a9e612b72cdf88d158fa72cb7144.tar.gz redmine-455abea32042a9e612b72cdf88d158fa72cb7144.zip | |
Adds a permission 'view wiki edits' so that wiki history can be hidden to certain users (#1154).
A migration automatically adds this permission to roles that were allowed to view wiki pages.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1815 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/wiki_content.rb')
| -rw-r--r-- | app/models/wiki_content.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/wiki_content.rb b/app/models/wiki_content.rb index f2ee39c4d..4a4c5c270 100644 --- a/app/models/wiki_content.rb +++ b/app/models/wiki_content.rb @@ -35,9 +35,9 @@ class WikiContent < ActiveRecord::Base :type => 'wiki-page', :url => Proc.new {|o| {:controller => 'wiki', :id => o.page.wiki.project_id, :page => o.page.title, :version => o.version}} - acts_as_activity_provider :type => 'wiki_pages', + acts_as_activity_provider :type => 'wiki_edits', :timestamp => "#{WikiContent.versioned_table_name}.updated_on", - :permission => :view_wiki_pages, + :permission => :view_wiki_edits, :find_options => {:select => "#{WikiContent.versioned_table_name}.updated_on, #{WikiContent.versioned_table_name}.comments, " + "#{WikiContent.versioned_table_name}.#{WikiContent.version_column}, #{WikiPage.table_name}.title, " + "#{WikiContent.versioned_table_name}.page_id, #{WikiContent.versioned_table_name}.author_id, " + |