kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11842 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2013-05-13 18:50:04 +00:00
parent 288c3b863d
commit 7e41730293
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/attachments/upload.js.erb
View File

@ -1,4 +1,8 @@
var fileSpan = $('#attachments_<%= j params[:attachment_id] %>'); 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); $('<input>', { type: 'hidden', name: 'attachments[<%= j params[:attachment_id] %>][token]' } ).val('<%= j @attachment.token %>').appendTo(fileSpan);
fileSpan.find('a.remove-upload') fileSpan.find('a.remove-upload')
.attr({ .attr({
@ -7,3 +11,4 @@ fileSpan.find('a.remove-upload')
href: '<%= j attachment_path(@attachment, :attachment_id => params[:attachment_id], :format => 'js') %>' href: '<%= j attachment_path(@attachment, :attachment_id => params[:attachment_id], :format => 'js') %>'
}) })
.off('click'); .off('click');
<% end %>