Mercurial > hg > soundsoftware-site
comparison app/controllers/files_controller.rb @ 441:cbce1fd3b1b7 redmine-1.2
Update to Redmine 1.2-stable branch (Redmine SVN rev 6000)
author | Chris Cannam |
---|---|
date | Mon, 06 Jun 2011 14:24:13 +0100 |
parents | 94944d00e43c |
children | 350acce374a2 433d4f72a19b |
comparison
equal
deleted
inserted
replaced
245:051f544170fe | 441:cbce1fd3b1b7 |
---|---|
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 |