From e68a5f1979ccc49a3cd5ec2c67fde2a9e19fc15d Mon Sep 17 00:00:00 2001 From: yuri Date: Thu, 9 Aug 2018 11:01:23 +0300 Subject: [PATCH] fix phone number ui --- client/res/templates/fields/phone/detail.tpl | 2 ++ client/src/views/fields/phone.js | 12 +++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/client/res/templates/fields/phone/detail.tpl b/client/res/templates/fields/phone/detail.tpl index e1d82b36a6..499340066d 100644 --- a/client/res/templates/fields/phone/detail.tpl +++ b/client/res/templates/fields/phone/detail.tpl @@ -10,7 +10,9 @@ {{/unless}} {{#if ../doNotCall}}{{/if}} + {{#if type}} ({{translateOption type scope=../../scope field=../../name}}) + {{/if}} {{/each}} {{else}} diff --git a/client/src/views/fields/phone.js b/client/src/views/fields/phone.js index 3b166d92bb..257f167689 100644 --- a/client/src/views/fields/phone.js +++ b/client/src/views/fields/phone.js @@ -76,12 +76,14 @@ Espo.define('views/fields/phone', 'views/fields/varchar', function (Dep) { } if ((!phoneNumberData || phoneNumberData.length === 0) && this.model.get(this.name)) { - phoneNumberData = [{ + var o = { phoneNumber: this.model.get(this.name), - primary: true, - primary: true, - type: this.defaultType - }]; + primary: true + }; + if (this.mode === 'edit' && this.model.isNew()) { + o.type = this.defaultType; + } + phoneNumberData = [o]; } var data = _.extend({