Mercurial > hg > soundsoftware-site
comparison 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 |
comparison
equal
deleted
inserted
replaced
451:a9f6345cb43d | 511:107d36338b70 |
---|---|
11 sort_init 'filename', 'asc' | 11 sort_init 'filename', 'asc' |
12 sort_update 'filename' => "#{Attachment.table_name}.filename", | 12 sort_update 'filename' => "#{Attachment.table_name}.filename", |
13 'created_on' => "#{Attachment.table_name}.created_on", | 13 'created_on' => "#{Attachment.table_name}.created_on", |
14 'size' => "#{Attachment.table_name}.filesize", | 14 'size' => "#{Attachment.table_name}.filesize", |
15 'downloads' => "#{Attachment.table_name}.downloads" | 15 'downloads' => "#{Attachment.table_name}.downloads" |
16 | 16 |
17 @containers = [ Project.find(@project.id, :include => :attachments, :order => sort_clause)] | 17 @containers = [ Project.find(@project.id, :include => :attachments, :order => sort_clause)] |
18 @containers += @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse | 18 @containers += @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse |
19 render :layout => !request.xhr? | 19 render :layout => !request.xhr? |
20 end | 20 end |
21 | 21 |