From dc4f59e6645766b7c5438abda453a58f892a9dd8 Mon Sep 17 00:00:00 2001 From: Yogesh Mahajan Date: Mon, 9 Aug 2021 20:11:39 +0530 Subject: [PATCH] Handle null values more correctly. refs #5198 --- web/pgadmin/static/js/slickgrid/editors.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/web/pgadmin/static/js/slickgrid/editors.js b/web/pgadmin/static/js/slickgrid/editors.js index 74b036489..8a2bffd5f 100644 --- a/web/pgadmin/static/js/slickgrid/editors.js +++ b/web/pgadmin/static/js/slickgrid/editors.js @@ -363,9 +363,9 @@ import gettext from 'sources/gettext'; /* Can be useful until JSON editor loads */ tmpdata = data; - if ( _.isUndefined(data) || _.isNull(data)){ - defaultValue = '{}'; - data = '{}'; + if (_.isNull(data)){ + defaultValue = undefined; + data = undefined; } /* If jsonb or array */ @@ -447,7 +447,7 @@ import gettext from 'sources/gettext'; if (data == '' && (_.isUndefined(defaultValue) || _.isNull(defaultValue) )) { return false; } else { - if(! _.isUndefined(defaultValue) && defaultValue != '{}'){ + if(! _.isUndefined(defaultValue) && defaultValue != ''){ defaultValue = JSON.stringify(JSON.parse(defaultValue), null,2); } return (!( data == '' && _.isNull(defaultValue)) && (data != defaultValue)); @@ -459,7 +459,7 @@ import gettext from 'sources/gettext'; args.column.column_type_internal === 'json') { let data = $editor.getText(); try { - if(data != '{}'){ + if(data != ''){ JSON.parse(data); } } catch(e) {