jro_apps/redmine Commit - r10976:48fb02e3839c

Split "Manage documents" permission into create, edit and delete permissions (#12401)....

Jean-Philippe Lang -

r10976:48fb02e3839c

parent child

Context file:

r10976:48fb02e3839c

db/migrate/20130110122628_split_documents_permissions.rb created 644 +23 0

@@ -0,0 +1,23
	1	class SplitDocumentsPermissions < ActiveRecord::Migration
	2	def up
	3	# :manage_documents permission split into 3 permissions:
	4	# :add_documents, :edit_documents and :delete_documents
	5	Role.all.each do \|role\|
	6	if role.has_permission?(:manage_documents)
	7	role.add_permission! :add_documents, :edit_documents, :delete_documents
	8	role.remove_permission! :manage_documents
	9	end
	10	end
	11	end
	12
	13	def down
	14	Role.all.each do \|role\|
	15	if role.has_permission?(:add_documents) \|\|
	16	role.has_permission?(:edit_documents) \|\|
	17	role.has_permission?(:delete_documents)
	18	role.remove_permission! :add_documents, :edit_documents, :delete_documents
	19	role.add_permission! :manage_documents
	20	end
	21	end
	22	end
	23	end

app/models/document.rb +1 -1

               include Redmine::SafeAttributes
               belongs_to :project
               belongs_to :category, :class_name => "DocumentCategory", :foreign_key => "category_id"
-              acts_as_attachable :delete_permission => :manage_documents
+              acts_as_attachable :delete_permission => :delete_documents
               acts_as_searchable :columns => ['title', "#{table_name}.description"], :include => :project
               acts_as_event :title => Proc.new {|o| "#{l(:label_document)}: #{o.title}"},

app/views/documents/index.html.erb +1 -1

             <div class="contextual">
             <%= link_to l(:label_document_new), new_project_document_path(@project), :class => 'icon icon-add',
-                  :onclick => 'showAndScrollTo("add-document", "document_title"); return false;' if User.current.allowed_to?(:manage_documents, @project) %>
+                  :onclick => 'showAndScrollTo("add-document", "document_title"); return false;' if User.current.allowed_to?(:add_documents, @project) %>
             </div>
             <div id="add-document" style="display:none;">

app/views/documents/show.html.erb +3 -1

             <div class="contextual">
-            <% if User.current.allowed_to?(:manage_documents, @project) %>
+            <% if User.current.allowed_to?(:edit_documents, @project) %>
             <%= link_to l(:button_edit), edit_document_path(@document), :class => 'icon icon-edit', :accesskey => accesskey(:edit) %>
+            <% end %>
+            <% if User.current.allowed_to?(:delete_documents, @project) %>
             <%= delete_link document_path(@document) %>
             <% end %>
             </div>

lib/redmine.rb +3 -1

               end
               map.project_module :documents do |map|
-                map.permission :manage_documents, {:documents => [:new, :create, :edit, :update, :destroy, :add_attachment]}, :require => :loggedin
+                map.permission :add_documents, {:documents => [:new, :create, :add_attachment]}, :require => :loggedin
+                map.permission :edit_documents, {:documents => [:edit, :update, :add_attachment]}, :require => :loggedin
+                map.permission :delete_documents, {:documents => [:destroy]}, :require => :loggedin
                 map.permission :view_documents, {:documents => [:index, :show, :download]}, :read => true
               end

test/fixtures/roles.yml +9 -4

                 - :manage_news
                 - :comment_news
                 - :view_documents
-                - :manage_documents
+                - :add_documents
+                - :edit_documents
+                - :delete_documents
                 - :view_wiki_pages
                 - :export_wiki_pages
                 - :view_wiki_edits
                 - :manage_news
                 - :comment_news
                 - :view_documents
-                - :manage_documents
+                - :add_documents
+                - :edit_documents
+                - :delete_documents
                 - :view_wiki_pages
                 - :view_wiki_edits
                 - :edit_wiki_pages
                 - :manage_news
                 - :comment_news
                 - :view_documents
-                - :manage_documents
+                - :add_documents
+                - :edit_documents
+                - :delete_documents
                 - :view_wiki_pages
                 - :view_wiki_edits
                 - :edit_wiki_pages
                 - :view_time_entries
                 - :comment_news
                 - :view_documents
-                - :manage_documents
                 - :view_wiki_pages
                 - :view_wiki_edits
                 - :edit_wiki_pages

test/unit/user_test.rb +1 -1

                   should "authorize nearly everything for admin users" do
                     project = Project.find(1)
                     assert ! @admin.member_of?(project)
-                    %w(edit_issues delete_issues manage_news manage_documents manage_wiki).each do |p|
+                    %w(edit_issues delete_issues manage_news add_documents manage_wiki).each do |p|
                       assert_equal true, @admin.allowed_to?(p.to_sym, project)
                     end
                   end

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