comparison 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
comparison
equal deleted inserted replaced
238:83bf35c4f9d1 262:f936ec3cb58a
8 include SortHelper 8 include SortHelper
9 9
10 def index 10 def index
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 'active' => "#{Attachment.table_name}.active",
13 'created_on' => "#{Attachment.table_name}.created_on", 14 'created_on' => "#{Attachment.table_name}.created_on",
14 'size' => "#{Attachment.table_name}.filesize", 15 'size' => "#{Attachment.table_name}.filesize",
15 'downloads' => "#{Attachment.table_name}.downloads" 16 'downloads' => "#{Attachment.table_name}.downloads"
16 17
17 @containers = [ Project.find(@project.id, :include => :attachments, :order => sort_clause)] 18 @containers = [ Project.find(@project.id, :include => :attachments, :order => sort_clause)]
31 if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added') 32 if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
32 Mailer.deliver_attachments_added(attachments[:files]) 33 Mailer.deliver_attachments_added(attachments[:files])
33 end 34 end
34 redirect_to project_files_path(@project) 35 redirect_to project_files_path(@project)
35 end 36 end
37
36 end 38 end