Mercurial > hg > soundsoftware-site
diff app/controllers/files_controller.rb @ 262:f936ec3cb58a live
Merge from branch "feature_80"
author | Chris Cannam |
---|---|
date | Fri, 04 Mar 2011 15:06:11 +0000 |
parents | 3ecf99348b9f |
children | f4a7c5aebbb5 |
line wrap: on
line diff
--- a/app/controllers/files_controller.rb Fri Feb 18 10:02:10 2011 +0000 +++ b/app/controllers/files_controller.rb Fri Mar 04 15:06:11 2011 +0000 @@ -10,6 +10,7 @@ def index sort_init 'filename', 'asc' sort_update 'filename' => "#{Attachment.table_name}.filename", + 'active' => "#{Attachment.table_name}.active", 'created_on' => "#{Attachment.table_name}.created_on", 'size' => "#{Attachment.table_name}.filesize", 'downloads' => "#{Attachment.table_name}.downloads" @@ -33,4 +34,5 @@ end redirect_to project_files_path(@project) end + end