From bba15ab759794726e98af9167267bed334a17056 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Mon, 4 Jul 2022 11:38:25 +0300 Subject: [PATCH 1/4] ref --- .../crm/src/views/call/fields/contacts.js | 48 +++++++++++-------- 1 file changed, 29 insertions(+), 19 deletions(-) diff --git a/client/modules/crm/src/views/call/fields/contacts.js b/client/modules/crm/src/views/call/fields/contacts.js index 1da135038f..3b11ff7e4f 100644 --- a/client/modules/crm/src/views/call/fields/contacts.js +++ b/client/modules/crm/src/views/call/fields/contacts.js @@ -26,38 +26,48 @@ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. ************************************************************************/ -Espo.define('crm:views/call/fields/contacts', 'crm:views/meeting/fields/contacts', function (Dep) { +define('crm:views/call/fields/contacts', ['crm:views/meeting/fields/contacts'], function (Dep) { return Dep.extend({ getAttributeList: function () { - var list = Dep.prototype.getAttributeList.call(this); + let list = Dep.prototype.getAttributeList.call(this); + list.push('phoneNumbersMap'); + return list; }, getDetailLinkHtml: function (id, name) { - var html = Dep.prototype.getDetailLinkHtml.call(this, id, name); + let html = Dep.prototype.getDetailLinkHtml.call(this, id, name); - var key = this.foreignScope + '_' + id; - var number = null; - var phoneNumbersMap = this.model.get('phoneNumbersMap') || {}; - if (key in phoneNumbersMap) { - number = phoneNumbersMap[key]; - var innerHtml = $(html).html(); + let key = this.foreignScope + '_' + id; + let phoneNumbersMap = this.model.get('phoneNumbersMap') || {}; - innerHtml += ( - ' ' + - '' + - number + '' - ); - - html = '
' + innerHtml + '
'; + if (!(key in phoneNumbersMap)) { + return html; } - return html; - } + let number = phoneNumbersMap[key]; + let $item = $(html); + + $item + .append( + ' ', + $('').addClass('text-muted chevron-right'), + ' ', + $('') + .attr('href', 'tel:' + number) + .attr('data-phone-number', number) + .attr('data-action', 'dial') + .addClass('small') + .text(number) + ) + + return $('
') + .append($item) + .get(0).outerHTML; + }, }); - }); From d5b6120d45e34cd47f3c750f67a2c4adfce8c068 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Mon, 4 Jul 2022 11:45:21 +0300 Subject: [PATCH 2/4] ref --- client/modules/crm/src/views/call/fields/leads.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/client/modules/crm/src/views/call/fields/leads.js b/client/modules/crm/src/views/call/fields/leads.js index abcfc5141b..541175627f 100644 --- a/client/modules/crm/src/views/call/fields/leads.js +++ b/client/modules/crm/src/views/call/fields/leads.js @@ -26,17 +26,24 @@ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. ************************************************************************/ -Espo.define('crm:views/call/fields/leads', 'crm:views/meeting/fields/attendees', function (Dep) { +define('crm:views/call/fields/leads', ['crm:views/meeting/fields/attendees', 'crm:views/call/fields/contacts'], +function (Dep, Contacts) { return Dep.extend({ getAttributeList: function () { - var list = Dep.prototype.getAttributeList.call(this); + let list = Dep.prototype.getAttributeList.call(this); + list.push('phoneNumbersMap'); + return list; }, getDetailLinkHtml: function (id, name) { + return Contacts.prototype.getDetailLinkHtml.call(this, id, name); + }, + + getDetailLinkHtml1: function (id, name) { var html = Dep.prototype.getDetailLinkHtml.call(this, id, name); var key = this.foreignScope + '_' + id; @@ -56,8 +63,6 @@ Espo.define('crm:views/call/fields/leads', 'crm:views/meeting/fields/attendees', } return html; - } - + }, }); - }); From a067eb20707f42ce33e9be5ca8e4fbb10b1f15ff Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Mon, 4 Jul 2022 11:55:24 +0300 Subject: [PATCH 3/4] v --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 4661fc45a8..ece48af0b7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "espocrm", - "version": "7.1.8", + "version": "7.1.9", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/package.json b/package.json index df2117b7ff..00eef68437 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "espocrm", - "version": "7.1.8", + "version": "7.1.9", "description": "Open-source CRM.", "repository": { "type": "git", From b5104cef3c4e0f044abcf499c9da06a665e1ee70 Mon Sep 17 00:00:00 2001 From: Yuri Kuznetsov Date: Mon, 4 Jul 2022 12:17:02 +0300 Subject: [PATCH 4/4] diff fix --- js/diff.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/diff.js b/js/diff.js index cc6800a4a4..290641f77f 100644 --- a/js/diff.js +++ b/js/diff.js @@ -695,6 +695,7 @@ class Diff let composerNewContents = cp.execSync("cat " + currentPath + "/composer.json").toString(); composerNewContents = composerNewContents.replace(/(\r\n)/g, '\n'); + composerLockNewContents = composerLockNewContents.replace(/(\r\n)/g, '\n'); if ( composerLockNewContents === composerLockOldContents &&