From 60c974aa926921753e1c68ca7554b3ad38e9b1f1 Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Sun, 20 Sep 2020 14:53:42 +0200 Subject: [PATCH] Update getValueForTarget in Number trait --- src/domain_abstract/ui/Input.js | 6 +++++- src/trait_manager/view/TraitNumberView.js | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/domain_abstract/ui/Input.js b/src/domain_abstract/ui/Input.js index 39b38a3a5..26f2afe72 100644 --- a/src/domain_abstract/ui/Input.js +++ b/src/domain_abstract/ui/Input.js @@ -69,7 +69,11 @@ export default Backbone.View.extend({ getInputEl() { if (!this.inputEl) { const { model } = this; - const plh = model.get('placeholder') || model.get('defaults') || ''; + const plh = + model.get('placeholder') || + model.get('defaults') || + model.get('default') || + ''; this.inputEl = $(``); } diff --git a/src/trait_manager/view/TraitNumberView.js b/src/trait_manager/view/TraitNumberView.js index 6554dd1e2..a89284e18 100644 --- a/src/trait_manager/view/TraitNumberView.js +++ b/src/trait_manager/view/TraitNumberView.js @@ -1,11 +1,14 @@ import TraitView from './TraitView'; +import { isUndefined } from 'underscore'; import InputNumber from 'domain_abstract/ui/InputNumber'; export default TraitView.extend({ getValueForTarget() { const { model } = this; const { value, unit } = model.attributes; - return value ? value + unit : ''; + return !isUndefined(value) && value !== '' + ? value + unit + : model.get('default'); }, /**