diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2013-10-29 16:00:34 +0100 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2013-10-29 16:00:34 +0100 |
| commit | 71cf83b314d4f016b0bd10673250f494e8643d71 (patch) | |
| tree | de03cde392b95a54126036b55b94c8d325c47f44 /apps | |
| parent | b0b76fe064860d2074c91897a29e0f9ac5705db8 (diff) | |
| download | nextcloud-server-71cf83b314d4f016b0bd10673250f494e8643d71.tar.gz nextcloud-server-71cf83b314d4f016b0bd10673250f494e8643d71.zip | |
Added fix to correctly parse non-array error messages
Some apps like the antivirus app return messages in a non-array format.
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/js/file-upload.js | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 5bf4f5c0981..95c0723f254 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -334,8 +334,13 @@ $(document).ready(function() { var result=$.parseJSON(response); delete data.jqXHR; - - if (typeof result[0] === 'undefined') { + + if (result.status === 'error' && result.data && result.data.message){ + data.textStatus = 'servererror'; + data.errorThrown = result.data.message; + var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload'); + fu._trigger('fail', e, data); + } else if (typeof result[0] === 'undefined') { data.textStatus = 'servererror'; data.errorThrown = t('files', 'Could not get result from server.'); var fu = $(this).data('blueimp-fileupload') || $(this).data('fileupload'); |