Index: test/fixtures/roles.yml =================================================================== --- test/fixtures/roles.yml (revision 1400) +++ test/fixtures/roles.yml (working copy) @@ -28,6 +28,7 @@ - :view_documents - :manage_documents - :view_wiki_pages + - :view_wiki_history - :edit_wiki_pages - :delete_wiki_pages - :rename_wiki_pages @@ -68,6 +69,7 @@ - :view_documents - :manage_documents - :view_wiki_pages + - :view_wiki_history - :edit_wiki_pages - :delete_wiki_pages - :add_messages @@ -103,6 +105,7 @@ - :view_documents - :manage_documents - :view_wiki_pages + - :view_wiki_history - :edit_wiki_pages - :delete_wiki_pages - :add_messages @@ -133,6 +136,7 @@ - :view_documents - :manage_documents - :view_wiki_pages + - :view_wiki_history - :edit_wiki_pages - :add_messages - :view_files @@ -153,6 +157,7 @@ - :view_time_entries - :view_documents - :view_wiki_pages + - :view_wiki_history - :view_files - :browse_repository - :view_changesets Index: app/views/wiki/show.rhtml =================================================================== --- app/views/wiki/show.rhtml (revision 1400) +++ app/views/wiki/show.rhtml (working copy) @@ -3,7 +3,7 @@ <%= link_to_if_authorized(l(:button_rename), {:action => 'rename', :page => @page.title}, :class => 'icon icon-move') if @content.version == @page.content.version %> <%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :page => @page.title}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') %> <%= link_to_if_authorized(l(:button_rollback), {:action => 'edit', :page => @page.title, :version => @content.version }, :class => 'icon icon-cancel') if @content.version < @page.content.version %> -<%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %> +<%= link_to_if_authorized(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %> <% if @content.version != @page.content.version %> Index: lib/redmine/default_data/loader.rb =================================================================== --- lib/redmine/default_data/loader.rb (revision 1400) +++ lib/redmine/default_data/loader.rb (working copy) @@ -61,6 +61,7 @@ :comment_news, :view_documents, :view_wiki_pages, + :view_wiki_history, :edit_wiki_pages, :delete_wiki_pages, :add_messages, @@ -81,6 +82,7 @@ :comment_news, :view_documents, :view_wiki_pages, + :view_wiki_history, :add_messages, :view_files, :browse_repository, @@ -95,6 +97,7 @@ :comment_news, :view_documents, :view_wiki_pages, + :view_wiki_history, :add_messages, :view_files, :browse_repository, @@ -105,6 +108,7 @@ :view_time_entries, :view_documents, :view_wiki_pages, + :view_wiki_history, :view_files, :browse_repository, :view_changesets] Index: lib/redmine.rb =================================================================== --- lib/redmine.rb (revision 1400) +++ lib/redmine.rb (working copy) @@ -74,7 +74,8 @@ 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_history, :wiki => [:history, :diff, :annotate] map.permission :edit_wiki_pages, :wiki => [:edit, :preview, :add_attachment, :destroy_attachment] end