annotate .svn/pristine/c6/c6259edf6d4a9d5a1738455be1808f3b0eaae4e1.svn-base @ 1519:afce8026aaeb redmine-2.4-integration

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