Add some error handling
This commit is contained in:
parent
c268ad1597
commit
c49402d266
|
@ -23,14 +23,30 @@
|
||||||
dirToken: $('#sharingToken').val()
|
dirToken: $('#sharingToken').val()
|
||||||
},
|
},
|
||||||
add: function(e, data) {
|
add: function(e, data) {
|
||||||
|
var errors = [];
|
||||||
|
if(data.files[0]['size'] && data.files[0]['size'] > $('#maxFilesizeUpload').val()) {
|
||||||
|
errors.push('File is too big');
|
||||||
|
}
|
||||||
|
|
||||||
_.each(data['files'], function(file) {
|
_.each(data['files'], function(file) {
|
||||||
$('#public-upload ul').append('<li data-name="'+escapeHTML(file.name)+'"><span class="icon-loading-small"></span> '+escapeHTML(file.name)+'</li>');
|
if(errors.length === 0) {
|
||||||
});
|
$('#public-upload ul').append('<li data-toggle="tooltip" title="'+escapeHTML(file.name)+'" data-name="'+escapeHTML(file.name)+'"><span class="icon-loading-small"></span> '+escapeHTML(file.name)+'</li>');
|
||||||
|
$('[data-toggle="tooltip"]').tooltip();
|
||||||
data.submit();
|
data.submit();
|
||||||
|
} else {
|
||||||
|
OC.Notification.showTemporary(OC.L10N.translate('files_sharing', 'Could not upload "{filename}"', {filename: file.name}));
|
||||||
|
$('#public-upload ul').append('<li data-toggle="tooltip" title="'+escapeHTML(file.name)+'" data-name="'+escapeHTML(file.name)+'"><img src="'+OC.imagePath('core', 'actions/error.svg')+'"/> '+escapeHTML(file.name)+'</li>');
|
||||||
|
$('[data-toggle="tooltip"]').tooltip();
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
},
|
},
|
||||||
success: function (response) {
|
success: function (response) {
|
||||||
|
if(response.status !== 'error') {
|
||||||
var mimeTypeUrl = OC.MimeType.getIconUrl(response['mimetype']);
|
var mimeTypeUrl = OC.MimeType.getIconUrl(response['mimetype']);
|
||||||
$('#public-upload ul li[data-name="' + escapeHTML(response['filename']) + '"]').html('<img src="' + escapeHTML(mimeTypeUrl) + '"/> ' + escapeHTML(response['filename']));
|
$('#public-upload ul li[data-name="' + escapeHTML(response['filename']) + '"]').html('<img src="' + escapeHTML(mimeTypeUrl) + '"/> ' + escapeHTML(response['filename']));
|
||||||
|
$('[data-toggle="tooltip"]').tooltip();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
$('#public-upload .button.icon-upload').click(function(e) {
|
$('#public-upload .button.icon-upload').click(function(e) {
|
||||||
|
|
|
@ -41,6 +41,13 @@ OCP\Util::addscript('files', 'keyboardshortcuts');
|
||||||
<input type="hidden" name="mimetype" value="<?php p($_['mimetype']) ?>" id="mimetype">
|
<input type="hidden" name="mimetype" value="<?php p($_['mimetype']) ?>" id="mimetype">
|
||||||
<input type="hidden" name="previewSupported" value="<?php p($_['previewSupported'] ? 'true' : 'false'); ?>" id="previewSupported">
|
<input type="hidden" name="previewSupported" value="<?php p($_['previewSupported'] ? 'true' : 'false'); ?>" id="previewSupported">
|
||||||
<input type="hidden" name="mimetypeIcon" value="<?php p(\OC::$server->getMimeTypeDetector()->mimeTypeIcon($_['mimetype'])); ?>" id="mimetypeIcon">
|
<input type="hidden" name="mimetypeIcon" value="<?php p(\OC::$server->getMimeTypeDetector()->mimeTypeIcon($_['mimetype'])); ?>" id="mimetypeIcon">
|
||||||
|
<?php
|
||||||
|
$upload_max_filesize = OC::$server->getIniWrapper()->getBytes('upload_max_filesize');
|
||||||
|
$post_max_size = OC::$server->getIniWrapper()->getBytes('post_max_size');
|
||||||
|
$maxUploadFilesize = min($upload_max_filesize, $post_max_size);
|
||||||
|
?>
|
||||||
|
<input type="hidden" name="maxFilesizeUpload" value="<?php p($maxUploadFilesize); ?>" id="maxFilesizeUpload">
|
||||||
|
|
||||||
<?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)): ?>
|
<?php if (!isset($_['hideFileList']) || (isset($_['hideFileList']) && $_['hideFileList'] === false)): ?>
|
||||||
<input type="hidden" name="filesize" value="<?php p($_['nonHumanFileSize']); ?>" id="filesize">
|
<input type="hidden" name="filesize" value="<?php p($_['nonHumanFileSize']); ?>" id="filesize">
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
|
|
Loading…
Reference in New Issue