| @@ -1,36 +1,36 | |||
|
|
1 | 1 | class FilesController < ApplicationController |
|
|
2 | 2 | menu_item :files |
|
|
3 | 3 | |
|
|
4 | 4 | before_filter :find_project_by_project_id |
|
|
5 | 5 | before_filter :authorize |
|
|
6 | 6 | |
|
|
7 | 7 | helper :sort |
|
|
8 | 8 | include SortHelper |
|
|
9 | 9 | |
|
|
10 | 10 | def index |
|
|
11 | 11 | sort_init 'filename', 'asc' |
|
|
12 | 12 | sort_update 'filename' => "#{Attachment.table_name}.filename", |
|
|
13 | 13 | 'created_on' => "#{Attachment.table_name}.created_on", |
|
|
14 | 14 | 'size' => "#{Attachment.table_name}.filesize", |
|
|
15 | 15 | 'downloads' => "#{Attachment.table_name}.downloads" |
|
|
16 | 16 | |
|
|
17 | 17 | @containers = [ Project.find(@project.id, :include => :attachments, :order => sort_clause)] |
|
|
18 | 18 | @containers += @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse |
|
|
19 | 19 | render :layout => !request.xhr? |
|
|
20 | 20 | end |
|
|
21 | 21 | |
|
|
22 | 22 | def new |
|
|
23 | 23 | @versions = @project.versions.sort |
|
|
24 | 24 | end |
|
|
25 | 25 | |
|
|
26 | 26 | def create |
|
|
27 | 27 | container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id])) |
|
|
28 | 28 | attachments = Attachment.attach_files(container, params[:attachments]) |
|
|
29 | 29 | render_attachment_warning_if_needed(container) |
|
|
30 | 30 | |
|
|
31 | if !attachments.empty? && Setting.notified_events.include?('file_added') | |
|
|
31 | if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added') | |
|
|
32 | 32 | Mailer.deliver_attachments_added(attachments[:files]) |
|
|
33 | 33 | end |
|
|
34 | 34 | redirect_to project_files_path(@project) |
|
|
35 | 35 | end |
|
|
36 | 36 | end |
General Comments 0
You need to be logged in to leave comments.
Login now