Merged trunk r1773.

git-svn-id: http://redmine.rubyforge.org/svn/branches/work@1774 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2008-08-30 14:41:07 +00:00
parent ab83ed5d8e
commit a377069fb2
398 changed files with 14736 additions and 5683 deletions
+3 -2
View File
@@ -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? %>
:conditions => "#{Document.table_name}.project_id in (#{project_ids.join(',')})",
:include => [:project])) unless project_ids.empty? %>