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

Merge branch 'hotfix/4.6.1'

Browse Source
This commit is contained in:
yuri
2017-04-27 11:33:31 +03:00
parent 5eaeabe231 9460943ad2
commit 5c034279e8
3 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/views/fields/attachment-multiple.js
+5 -1
View File
@@ -252,6 +252,8 @@ Espo.define('views/fields/attachment-multiple', 'views/fields/base', function (D
},
getEditPreview: function (name, type, id) {
name = Handlebars.Utils.escapeExpression(name);
var preview = name;
switch (type) {
@@ -411,6 +413,8 @@ Espo.define('views/fields/attachment-multiple', 'views/fields/base', function (D
},
getDetailPreview: function (name, type, id) {
name = Handlebars.Utils.escapeExpression(name);
var preview = name;
if (this.isTypeIsImage(type)) {
@@ -433,7 +437,7 @@ Espo.define('views/fields/attachment-multiple', 'views/fields/base', function (D
previews.push('<div class="attachment-preview">' + this.getDetailPreview(name, type, id) + '</div>');
continue;
}
var line = '<div class="attachment-block"><span class="glyphicon glyphicon-paperclip small"></span> <a href="' + this.getDownloadUrl(id) + '" target="_BLANK">' + name + '</a></div>';
var line = '<div class="attachment-block"><span class="glyphicon glyphicon-paperclip small"></span> <a href="' + this.getDownloadUrl(id) + '" target="_BLANK">' + Handlebars.Utils.escapeExpression(name); + '</a></div>';
names.push(line);
}
var string = previews.join('') + names.join('');
client/src/views/fields/file.js
+5 -1
View File
@@ -187,6 +187,7 @@ Espo.define('views/fields/file', 'views/fields/link', function (Dep) {
},
getDetailPreview: function (name, type, id) {
name = Handlebars.Utils.escapeExpression(name);
var preview = name;
switch (type) {
@@ -199,6 +200,7 @@ Espo.define('views/fields/file', 'views/fields/link', function (Dep) {
},
getEditPreview: function (name, type, id) {
name = Handlebars.Utils.escapeExpression(name);
var preview = name;
switch (type) {
@@ -226,7 +228,7 @@ Espo.define('views/fields/file', 'views/fields/link', function (Dep) {
if (this.showPreview && ~this.previewTypeList.indexOf(type)) {
string = '<div class="attachment-preview">' + this.getDetailPreview(name, type, id) + '</div>';
} else {
string = '<span class="glyphicon glyphicon-paperclip small"></span> <a href="'+ this.getDownloadUrl(id) +'" target="_BLANK">' + name + '</a>';
string = '<span class="glyphicon glyphicon-paperclip small"></span> <a href="'+ this.getDownloadUrl(id) +'" target="_BLANK">' + Handlebars.Utils.escapeExpression(name) + '</a>';
}
return string;
}
@@ -333,6 +335,8 @@ Espo.define('views/fields/file', 'views/fields/link', function (Dep) {
addAttachmentBox: function (name, type, id) {
this.$attachment.empty();
name = Handlebars.Utils.escapeExpression(name);
var self = this;
var removeLink = '<a href="javascript:" class="remove-attachment pull-right"><span class="glyphicon glyphicon-remove"></span></a>';
client/src/views/modals/detail.js
+1 -1
View File
@@ -185,7 +185,7 @@ Espo.define('views/modals/detail', 'views/modal', function (Dep) {
this.header = this.getLanguage().translate(scope, 'scopeNames');
if (model.get('name')) {
this.header += ' &raquo; ' + model.get('name');
this.header += ' &raquo; ' + Handlebars.Utils.escapeExpression(model.get('name'));
}
if (!this.fullFormDisabled) {
this.header = '<a href="#' + scope + '/view/' + this.id+'" class="action" title="'+this.translate('Full Form')+'" data-action="fullForm">' + this.header + '</a>';