Display error messages when attachment validation fails (#13949).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11842 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/attachments/upload.js.erb b/app/views/attachments/upload.js.erb
index 04e30b569deff33be1f6a9b521dda7d419888b52..acd8f83e1071a3d653ca3ced386be1c6a362cef8 100644 (file)
--- a/app/views/attachments/upload.js.erb
+++ b/app/views/attachments/upload.js.erb
@@ -1,4 +1,8 @@
 var fileSpan = $('#attachments_<%= j params[:attachment_id] %>');
+<% if @attachment.new_record? %>
+  fileSpan.hide();
+  alert("<%= escape_javascript @attachment.errors.full_messages.join(', ') %>");
+<% else %>
 $('<input>', { type: 'hidden', name: 'attachments[<%= j params[:attachment_id] %>][token]' } ).val('<%= j @attachment.token %>').appendTo(fileSpan);
 fileSpan.find('a.remove-upload')
   .attr({
@@ -7,3 +11,4 @@ fileSpan.find('a.remove-upload')
     href: '<%= j attachment_path(@attachment, :attachment_id => params[:attachment_id], :format => 'js') %>'
   })
   .off('click');
+<% end %>