diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-05-13 18:50:04 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2013-05-13 18:50:04 +0000 |
| commit | 7e41730293c5df1dd393495f4c8fe4124da82ff8 (patch) | |
| tree | e7c648be834223c1b71454cc97e3d6a70d6fd179 /app/views | |
| parent | 288c3b863ddf9a4220f7b6988d603040cbf51a97 (diff) | |
| download | redmine-7e41730293c5df1dd393495f4c8fe4124da82ff8.tar.gz redmine-7e41730293c5df1dd393495f4c8fe4124da82ff8.zip | |
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
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/attachments/upload.js.erb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/views/attachments/upload.js.erb b/app/views/attachments/upload.js.erb index 04e30b569..acd8f83e1 100644 --- 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 %> |