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
This commit is contained in:
parent
ea627ca98d
commit
09eba46ec1
|
@ -1,8 +1,9 @@
|
||||||
<h3><%=l(:label_document_plural)%></h3>
|
<h3><%=l(:label_document_plural)%></h3>
|
||||||
|
|
||||||
|
<% project_ids = @user.projects.select {|p| @user.allowed_to?(:view_documents, p)}.collect(&:id) %>
|
||||||
<%= render(:partial => 'documents/document',
|
<%= render(:partial => 'documents/document',
|
||||||
:collection => Document.find(:all,
|
:collection => Document.find(:all,
|
||||||
:limit => 10,
|
:limit => 10,
|
||||||
:order => "#{Document.table_name}.created_on DESC",
|
:order => "#{Document.table_name}.created_on DESC",
|
||||||
:conditions => "#{Document.table_name}.project_id in (#{@user.projects.collect{|m| m.id}.join(',')})",
|
:conditions => "#{Document.table_name}.project_id in (#{project_ids.join(',')})",
|
||||||
:include => [:project])) unless @user.projects.empty? %>
|
:include => [:project])) unless project_ids.empty? %>
|
Loading…
Reference in New Issue