diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-01-20 11:38:20 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-01-20 11:38:20 +0000 |
| commit | 48fb02e3839c30667733e59415d98c373467876b (patch) | |
| tree | e7fbabd25d1f5e1c2cc3a55d1c5bddc45dcc70e1 /app | |
| parent | 26016cdc086ad61075512414e72b3f3b9b6d8069 (diff) | |
| download | redmine-48fb02e3839c30667733e59415d98c373467876b.tar.gz redmine-48fb02e3839c30667733e59415d98c373467876b.zip | |
Split "Manage documents" permission into create, edit and delete permissions (#12401).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11206 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/document.rb | 2 | ||||
| -rw-r--r-- | app/views/documents/index.html.erb | 2 | ||||
| -rw-r--r-- | app/views/documents/show.html.erb | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/app/models/document.rb b/app/models/document.rb index 3fcdcee46..0c2ce1736 100644 --- a/app/models/document.rb +++ b/app/models/document.rb @@ -19,7 +19,7 @@ class Document < ActiveRecord::Base 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}"}, diff --git a/app/views/documents/index.html.erb b/app/views/documents/index.html.erb index 28fc74684..84567741e 100644 --- a/app/views/documents/index.html.erb +++ b/app/views/documents/index.html.erb @@ -1,6 +1,6 @@ <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;"> diff --git a/app/views/documents/show.html.erb b/app/views/documents/show.html.erb index b1d58d522..ee5890936 100644 --- a/app/views/documents/show.html.erb +++ b/app/views/documents/show.html.erb @@ -1,6 +1,8 @@ <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> |