Mercurial > hg > soundsoftware-site
diff app/controllers/.svn/text-base/files_controller.rb.svn-base @ 511:107d36338b70 live
Merge from branch "cannam"
author | Chris Cannam |
---|---|
date | Thu, 14 Jul 2011 10:43:07 +0100 |
parents | cbce1fd3b1b7 |
children |
line wrap: on
line diff
--- a/app/controllers/.svn/text-base/files_controller.rb.svn-base Thu Jun 09 16:51:06 2011 +0100 +++ b/app/controllers/.svn/text-base/files_controller.rb.svn-base Thu Jul 14 10:43:07 2011 +0100 @@ -13,7 +13,7 @@ 'created_on' => "#{Attachment.table_name}.created_on", 'size' => "#{Attachment.table_name}.filesize", 'downloads' => "#{Attachment.table_name}.downloads" - + @containers = [ Project.find(@project.id, :include => :attachments, :order => sort_clause)] @containers += @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse render :layout => !request.xhr?