From fe6b6bc869e9cbe859dda8bbc6cc40e5b5a5e923 Mon Sep 17 00:00:00 2001 From: yuri Date: Fri, 13 Sep 2019 16:35:15 +0300 Subject: [PATCH] enum fix --- client/res/templates/fields/enum/detail.tpl | 2 +- client/src/views/fields/enum.js | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/client/res/templates/fields/enum/detail.tpl b/client/res/templates/fields/enum/detail.tpl index 4e09933f3c..6158308704 100644 --- a/client/res/templates/fields/enum/detail.tpl +++ b/client/res/templates/fields/enum/detail.tpl @@ -1,5 +1,5 @@ {{#if isNotEmpty}}{{#if style}} {{/if}}{{translateOption value scope=scope field=name translatedOptions=translatedOptions}}{{#if style}}{{/if}} {{else}} -{{translate 'None'}} +{{#if valueIsSet}}{{translate 'None'}}{{else}}...{{/if}} {{/if}} \ No newline at end of file diff --git a/client/src/views/fields/enum.js b/client/src/views/fields/enum.js index 41b4029901..d66588be1c 100644 --- a/client/src/views/fields/enum.js +++ b/client/src/views/fields/enum.js @@ -26,7 +26,7 @@ * these Appropriate Legal Notices must retain the display of the "EspoCRM" word. ************************************************************************/ -Espo.define('views/fields/enum', ['views/fields/base', 'lib!Selectize'], function (Dep) { +define('views/fields/enum', ['views/fields/base', 'lib!Selectize'], function (Dep) { return Dep.extend({ @@ -64,6 +64,8 @@ Espo.define('views/fields/enum', ['views/fields/base', 'lib!Selectize'], functio } if ( + typeof value !== 'undefined' + && value !== null && value !== '' @@ -72,6 +74,9 @@ Espo.define('views/fields/enum', ['views/fields/base', 'lib!Selectize'], functio ) { data.isNotEmpty = true; } + + data.valueIsSet = this.model.has(this.name); + return data; },