espocrm-extensions/espocrm-base
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

attachments fixes

Browse Source
This commit is contained in:
Yuri Kuznetsov
2022-05-31 12:30:53 +03:00
parent 521f407714
commit d6b48962ce
2 changed files with 80 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/views/fields/attachment-multiple.js
+41 -33
View File
@@ -348,15 +348,8 @@ define('views/fields/attachment-multiple', ['views/fields/base', 'helpers/file-u
return html;
},
addAttachmentBox: function (name, type, id) {
id = Handlebars.Utils.escapeExpression(id);
var $attachments = this.$attachments;
var removeLink = '<a href="javascript:" class="remove-attachment pull-right">'+
'<span class="fas fa-times"></span></a>';
var preview = name;
getBoxPreviewHtml: function (name, type, id) {
let preview = name;
if (this.showPreviews && id) {
preview = this.getEditPreview(name, type, id);
@@ -366,43 +359,58 @@ define('views/fields/attachment-multiple', ['views/fields/base', 'helpers/file-u
if (preview === name && id) {
preview = '<a href="' + this.getBasePath() + '?entryPoint=download&id=' + id + '" target="_BLANK">' +
preview + '</a>';
name + '</a>';
}
var $att = $('<div>')
return preview;
},
addAttachmentBox: function (name, type, id) {
id = Handlebars.Utils.escapeExpression(id);
let $attachments = this.$attachments;
let removeLink = '<a href="javascript:" class="remove-attachment pull-right">'+
'<span class="fas fa-times"></span></a>';
let previewHtml = this.getBoxPreviewHtml(name, type, id);
let $att = $('<div>')
.addClass('gray-box')
.append(removeLink)
.append(
$('<span class="preview">' + preview + '</span>')
$('<span class="preview">' + previewHtml + '</span>')
);
var $container = $('<div>').append($att);
let $container = $('<div>').append($att);
$attachments.append($container);
if (!id) {
var $loading = $('<span class="small uploading-message">' +
this.translate('Uploading...') + '</span>');
$container.append($loading);
$att.on('ready', () => {
$loading.html(this.translate('Ready'));
if (preview === name) {
let id = $att.attr('data-id');
preview = '<a href="' + this.getBasePath() + '?entryPoint=download&id=' +
id + '" target="_BLANK">' + name + '</a>';
$att.find('.preview').html(preview);
}
});
}
else {
if (id) {
$att.attr('data-id', id);
return $att;
}
let $loading = $('<span class="small uploading-message">' +
this.translate('Uploading...') + '</span>');
$container.append($loading);
$att.on('ready', () => {
$loading.html(this.translate('Ready'));
let id = $att.attr('data-id');
let previewHtml = this.getBoxPreviewHtml(name, type, id);
$att.find('.preview').html(previewHtml);
if ($att.find('.preview').children().get(0).tagName === 'IMG') {
$loading.remove();
}
});
return $att;
},
client/src/views/fields/file.js
+39 -31
View File
@@ -586,57 +586,65 @@ define('views/fields/file', ['views/fields/link', 'helpers/file-upload'], functi
return new Promise(resolve => resolve(file));
},
addAttachmentBox: function (name, type, id) {
this.$attachment.empty();
var removeLink = '<a href="javascript:" class="remove-attachment pull-right">' +
'<span class="fas fa-times"></span></a>';
var preview = name;
getBoxPreviewHtml: function (name, type, id) {
let preview = name;
if (this.showPreview && id) {
preview = this.getEditPreview(name, type, id);
}
else {
} else {
preview = Handlebars.Utils.escapeExpression(preview);
}
if (preview === name && id) {
preview = '<a href="' + this.getBasePath() + '?entryPoint=download&id=' + id + '" target="_BLANK">' +
preview + '</a>';
name + '</a>';
}
var $att = $('<div>')
return preview;
},
addAttachmentBox: function (name, type, id) {
this.$attachment.empty();
let removeLink = '<a href="javascript:" class="remove-attachment pull-right">' +
'<span class="fas fa-times"></span></a>';
let previewHtml = this.getBoxPreviewHtml(name, type, id);
let $att = $('<div>')
.append(removeLink)
.append(
$('<span class="preview">' + preview + '</span>')
$('<span class="preview">' + previewHtml + '</span>')
.addClass('gray-box')
);
var $container = $('<div>').append($att);
let $container = $('<div>').append($att);
this.$attachment.append($container);
if (!id) {
let $loading = $('<span class="small uploading-message">' +
this.translate('Uploading...') + '</span>');
$container.append($loading);
$att.on('ready', () => {
$loading.html(this.translate('Ready'));
if (preview === name) {
let id = this.model.get(this.idName);
preview = '<a href="' + this.getBasePath() + '?entryPoint=download&id=' +
id + '" target="_BLANK">' + name + '</a>';
$att.find('.preview').html(preview);
}
});
if (id) {
return $att;
}
let $loading = $('<span class="small uploading-message">' +
this.translate('Uploading...') + '</span>');
$container.append($loading);
$att.on('ready', () => {
let id = this.model.get(this.idName);
let previewHtml = this.getBoxPreviewHtml(name, type, id);
$att.find('.preview').html(previewHtml);
$loading.html(this.translate('Ready'));
if ($att.find('.preview').children().get(0).tagName === 'IMG') {
$loading.remove();
}
});
return $att;
},