summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-08-26 11:08:45 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-08-26 11:08:45 +0000
commit09eba46ec1a699f2429b4ebddaa3aedfa6c57118 (patch)
treeaa60dfd2d1002d61f87678f4870fe4aa71b822ea
parentea627ca98d2113fd07cc4c231398018e44fa9291 (diff)
downloadredmine-09eba46ec1a699f2429b4ebddaa3aedfa6c57118.tar.gz
redmine-09eba46ec1a699f2429b4ebddaa3aedfa6c57118.zip
Fixed: document listing shows on "my page" when viewing documents is disabled for the role (#1772).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1766 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/views/my/blocks/_documents.rhtml5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/my/blocks/_documents.rhtml b/app/views/my/blocks/_documents.rhtml
index a34be936f..d222e4203 100644
--- a/app/views/my/blocks/_documents.rhtml
+++ b/app/views/my/blocks/_documents.rhtml
@@ -1,8 +1,9 @@
<h3><%=l(:label_document_plural)%></h3>
+<% project_ids = @user.projects.select {|p| @user.allowed_to?(:view_documents, p)}.collect(&:id) %>
<%= render(:partial => 'documents/document',
:collection => Document.find(:all,
:limit => 10,
:order => "#{Document.table_name}.created_on DESC",
- :conditions => "#{Document.table_name}.project_id in (#{@user.projects.collect{|m| m.id}.join(',')})",
- :include => [:project])) unless @user.projects.empty? %> \ No newline at end of file
+ :conditions => "#{Document.table_name}.project_id in (#{project_ids.join(',')})",
+ :include => [:project])) unless project_ids.empty? %> \ No newline at end of file