summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-09-13 16:45:01 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-09-13 16:45:01 +0000
commit455abea32042a9e612b72cdf88d158fa72cb7144 (patch)
tree4c1f313ed96bcf98817840520160cea1ad86b13e /lib
parentcc643ce932b2abdc56c4d1933c02806ca57ddefa (diff)
downloadredmine-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 'lib')
-rw-r--r--lib/redmine.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/redmine.rb b/lib/redmine.rb
index fdacb23b9..5529e0bf5 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -79,7 +79,8 @@ Redmine::AccessControl.map do |map|
map.permission :manage_wiki, {:wikis => [:edit, :destroy]}, :require => :member
map.permission :rename_wiki_pages, {:wiki => :rename}, :require => :member
map.permission :delete_wiki_pages, {:wiki => :destroy}, :require => :member
- map.permission :view_wiki_pages, :wiki => [:index, :history, :diff, :annotate, :special]
+ map.permission :view_wiki_pages, :wiki => [:index, :special]
+ map.permission :view_wiki_edits, :wiki => [:history, :diff, :annotate]
map.permission :edit_wiki_pages, :wiki => [:edit, :preview, :add_attachment, :destroy_attachment]
map.permission :protect_wiki_pages, {:wiki => :protect}, :require => :member
end
@@ -145,6 +146,6 @@ Redmine::Activity.map do |activity|
activity.register :news
activity.register :documents, :class_name => %w(Document Attachment)
activity.register :files, :class_name => 'Attachment'
- activity.register :wiki_pages, :class_name => 'WikiContent::Version', :default => false
+ activity.register :wiki_edits, :class_name => 'WikiContent::Version', :default => false
activity.register :messages, :default => false
end