comparison app/controllers/files_controller.rb @ 511:107d36338b70 live

Merge from branch "cannam"
author Chris Cannam
date Thu, 14 Jul 2011 10:43:07 +0100
parents 350acce374a2
children 251b380117ce bb32da3bea34
comparison
equal deleted inserted replaced
451:a9f6345cb43d 511:107d36338b70
12 sort_update 'filename' => "#{Attachment.table_name}.filename", 12 sort_update 'filename' => "#{Attachment.table_name}.filename",
13 'active' => "#{Attachment.table_name}.active", 13 'active' => "#{Attachment.table_name}.active",
14 'created_on' => "#{Attachment.table_name}.created_on", 14 'created_on' => "#{Attachment.table_name}.created_on",
15 'size' => "#{Attachment.table_name}.filesize", 15 'size' => "#{Attachment.table_name}.filesize",
16 'downloads' => "#{Attachment.table_name}.downloads" 16 'downloads' => "#{Attachment.table_name}.downloads"
17 17
18 @containers = [ Project.find(@project.id, :include => :attachments, :order => sort_clause)] 18 @containers = [ Project.find(@project.id, :include => :attachments, :order => sort_clause)]
19 @containers += @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse 19 @containers += @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
20 render :layout => !request.xhr? 20 render :layout => !request.xhr?
21 end 21 end
22 22