| @@ -1,53 +1,53 | |||
|
|
1 | 1 | # Redmine - project management software |
|
|
2 | 2 | # Copyright (C) 2006-2012 Jean-Philippe Lang |
|
|
3 | 3 | # |
|
|
4 | 4 | # This program is free software; you can redistribute it and/or |
|
|
5 | 5 | # modify it under the terms of the GNU General Public License |
|
|
6 | 6 | # as published by the Free Software Foundation; either version 2 |
|
|
7 | 7 | # of the License, or (at your option) any later version. |
|
|
8 | 8 | # |
|
|
9 | 9 | # This program is distributed in the hope that it will be useful, |
|
|
10 | 10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
|
11 | 11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
|
12 | 12 | # GNU General Public License for more details. |
|
|
13 | 13 | # |
|
|
14 | 14 | # You should have received a copy of the GNU General Public License |
|
|
15 | 15 | # along with this program; if not, write to the Free Software |
|
|
16 | 16 | # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. |
|
|
17 | 17 | |
|
|
18 | 18 | class FilesController < ApplicationController |
|
|
19 | 19 | menu_item :files |
|
|
20 | 20 | |
|
|
21 | 21 | before_filter :find_project_by_project_id |
|
|
22 | 22 | before_filter :authorize |
|
|
23 | 23 | |
|
|
24 | 24 | helper :sort |
|
|
25 | 25 | include SortHelper |
|
|
26 | 26 | |
|
|
27 | 27 | def index |
|
|
28 | 28 | sort_init 'filename', 'asc' |
|
|
29 | 29 | sort_update 'filename' => "#{Attachment.table_name}.filename", |
|
|
30 | 30 | 'created_on' => "#{Attachment.table_name}.created_on", |
|
|
31 | 31 | 'size' => "#{Attachment.table_name}.filesize", |
|
|
32 | 32 | 'downloads' => "#{Attachment.table_name}.downloads" |
|
|
33 | 33 | |
|
|
34 | @containers = [ Project.find(@project.id, :include => :attachments, :order => sort_clause)] | |
|
|
35 |
@containers += @project.versions. |
|
|
|
34 | @containers = [ Project.includes(:attachments).reorder(sort_clause).find(@project.id)] | |
|
|
35 | @containers += @project.versions.includes(:attachments).reorder(sort_clause).all.sort.reverse | |
|
|
36 | 36 | render :layout => !request.xhr? |
|
|
37 | 37 | end |
|
|
38 | 38 | |
|
|
39 | 39 | def new |
|
|
40 | 40 | @versions = @project.versions.sort |
|
|
41 | 41 | end |
|
|
42 | 42 | |
|
|
43 | 43 | def create |
|
|
44 | 44 | container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id])) |
|
|
45 | 45 | attachments = Attachment.attach_files(container, params[:attachments]) |
|
|
46 | 46 | render_attachment_warning_if_needed(container) |
|
|
47 | 47 | |
|
|
48 | 48 | if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added') |
|
|
49 | 49 | Mailer.attachments_added(attachments[:files]).deliver |
|
|
50 | 50 | end |
|
|
51 | 51 | redirect_to project_files_path(@project) |
|
|
52 | 52 | end |
|
|
53 | 53 | end |
General Comments 0
You need to be logged in to leave comments.
Login now