jro_apps/redmine Commit - r1813:455abea32042

Adds a permission 'view wiki edits' so that wiki history can be hidden to certain users (#1154)....

Jean-Philippe Lang -

r1813:455abea32042

parent child

Context file:

r1813:455abea32042

db/migrate/097_add_wiew_wiki_edits_permission.rb created 644 +13 0

@@ -0,0 +1,13
	1	class AddWiewWikiEditsPermission < ActiveRecord::Migration
	2	def self.up
	3	Role.find(:all).each do \|r\|
	4	r.add_permission!(:view_wiki_edits) if r.has_permission?(:view_wiki_pages)
	5	end
	6	end
	7
	8	def self.down
	9	Role.find(:all).each do \|r\|
	10	r.remove_permission!(:view_wiki_edits)
	11	end
	12	end
	13	end

app/controllers/wiki_controller.rb +5 0

                   end
                   return
                 end
+                if params[:version] && !User.current.allowed_to?(:view_wiki_edits, @project)
+                  # Redirects user to the current version if he's not allowed to view previous versions
+                  redirect_to :version => nil
+                  return
+                end
                 @content = @page.content_for_version(params[:version])
                 if params[:export] == 'html'
                   export = render_to_string :action => 'export', :layout => false

app/models/role.rb +5 0

                 save!
               end
+              # Returns true if the role has the given permission
+              def has_permission?(perm)
+                !permissions.nil? && permissions.include?(perm.to_sym)
+              end
               def <=>(role)
                 position <=> role.position
               end

app/models/wiki_content.rb +2 -2

                               :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, " +

app/views/wiki/show.rhtml +1 -1

             <%= 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 %>
             <% end %>
-            <%= 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') %>
             </div>
             <%= breadcrumb(@page.ancestors.reverse.collect {|parent| link_to h(parent.pretty_title), {:page => parent.title}}) %>

lib/redmine.rb +3 -2

                 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
               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

test/fixtures/roles.yml +5 0

                 - :view_documents
                 - :manage_documents
                 - :view_wiki_pages
+                - :view_wiki_edits
                 - :edit_wiki_pages
                 - :protect_wiki_pages
                 - :delete_wiki_pages
                 - :view_documents
                 - :manage_documents
                 - :view_wiki_pages
+                - :view_wiki_edits
                 - :edit_wiki_pages
                 - :protect_wiki_pages
                 - :delete_wiki_pages
                 - :view_documents
                 - :manage_documents
                 - :view_wiki_pages
+                - :view_wiki_edits
                 - :edit_wiki_pages
                 - :delete_wiki_pages
                 - :add_messages
                 - :view_documents
                 - :manage_documents
                 - :view_wiki_pages
+                - :view_wiki_edits
                 - :edit_wiki_pages
                 - :add_messages
                 - :view_files
                 - :view_time_entries
                 - :view_documents
                 - :view_wiki_pages
+                - :view_wiki_edits
                 - :view_files
                 - :browse_repository
                 - :view_changesets

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages