EspoCRM – Open Source CRM Application
PHP calendarcontactscrmcrm-platformcrm-systemcustomer-portalcustomer-supportcustomizabledocumentsemail-marketingkanbanleadsopen-sourcephpplatformsales-automationsingle-page-applicationsupport
ref
Yuri Kuznetsov03608a74d068
diff --git a/client/src/views/fields/array.js b/client/src/views/fields/array.jsindex 148d3f69da..8dcb04f8c1 100644--- a/client/src/views/fields/array.js+++ b/client/src/views/fields/array.js@@ -650,31 +650,41 @@ class ArrayFieldView extends BaseFieldView {this.translatedOptions[value].toString() :value;- return $('<div>')- .addClass('list-group-item')- .attr('data-value', value)- .css('cursor', 'default')- .append(- !this.params.keepItems ?- $('<a>')- .attr('role', 'button')- .attr('tabindex', '0')- .addClass('pull-right')- .attr('data-value', value)- .attr('data-action', 'removeValue')- .append(- $('<span>').addClass('fas fa-times')- ) :- undefined- )- .append(- $('<span>')- .addClass('text')- .text(text)- )- .append('')- .get(0)- .outerHTML;+ const div = document.createElement('div');+ div.classList.add('list-group-item');+ div.dataset.value = value;+ div.style.cursor = 'default';++ if (!this.params.keepItems) {+ const a = document.createElement('a');+ a.role = 'button';+ a.tabIndex = 0;+ a.classList.add('pull-right');+ a.dataset.value = value;+ a.dataset.action = 'removeValue';+ a.append(+ (() => {+ const span = document.createElement('span');+ span.classList.add('fas', 'fa-times');++ return span;+ })(),+ );++ div.append(a);+ }++ div.append(+ (() => {+ const span = document.createElement('span');+ span.classList.add('text');+ span.textContent = text;++ return span;+ })(),+ );++ return div.outerHTML;}/**diff --git a/client/src/views/fields/link-multiple.js b/client/src/views/fields/link-multiple.jsindex df1ab09afa..74488a46f4 100644--- a/client/src/views/fields/link-multiple.js+++ b/client/src/views/fields/link-multiple.js@@ -782,28 +782,43 @@ class LinkMultipleFieldView extends BaseFieldView {* @return {HTMLElement}*/prepareEditItemElement(id, name) {- // Beware of XSS.+ const item = document.createElement('div');+ item.classList.add('link-' + id);+ item.classList.add('list-group-item');+ item.dataset.id = id;++ item.append(+ (() => {+ const a = document.createElement('a');+ a.role = 'button';+ a.tabIndex = 0;+ a.classList.add('pull-right');+ a.dataset.id = id;+ a.dataset.action = 'clearLink';+ a.append(+ (() => {+ const span = document.createElement('span');+ span.classList.add('fas', 'fa-times');++ return span;+ })(),+ );++ return a;+ })()+ );++ item.append(+ (() => {+ const span = document.createElement('span');+ span.classList.add('text');+ span.textContent = name;- const $el = $('<div>')- .addClass('link-' + id)- .addClass('list-group-item')- .attr('data-id', id);-- $el.text(name).append(' ');-- $el.prepend(- $('<a>')- .addClass('pull-right')- .attr('role', 'button')- .attr('tabindex', '0')- .attr('data-id', id)- .attr('data-action', 'clearLink')- .append(- $('<span>').addClass('fas fa-times')- )+ return span;+ })());- return $el.get(0);+ return item;}// noinspection JSUnusedLocalSymbols