Commit 40d7db88 authored by jplang's avatar jplang

Adds flash messages to files_controller#create (#19793).

git-svn-id: https://svn.redmine.org/redmine/trunk@14243 e93f8b46-1217-0410-a6f0-8f06a7374b81
parent f5238f5b
......@@ -47,9 +47,16 @@ class FilesController < ApplicationController
attachments = Attachment.attach_files(container, params[:attachments])
render_attachment_warning_if_needed(container)
if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
Mailer.attachments_added(attachments[:files]).deliver
if attachments[:files].present?
if Setting.notified_events.include?('file_added')
Mailer.attachments_added(attachments[:files]).deliver
end
flash[:notice] = l(:label_file_added)
redirect_to project_files_path(@project)
else
flash.now[:error] = l(:label_attachment) + " " + l('activerecord.errors.messages.invalid')
new
render :action => 'new'
end
redirect_to project_files_path(@project)
end
end
......@@ -106,4 +106,15 @@ class FilesControllerTest < ActionController::TestCase
assert_equal Version.find(2), a.container
end
def test_create_without_file
set_tmp_attachments_directory
@request.session[:user_id] = 2
assert_no_difference 'Attachment.count' do
post :create, :project_id => 1, :version_id => ''
assert_response 200
assert_template 'new'
end
assert_select 'div.error', 'File is invalid'
end
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment