pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Handle null values more correctly. 

refs #5198
pull/56/head
Yogesh Mahajan 2021-08-09 20:11:39 +05:30 committed by Akshay Joshi
parent 8738f6dd98
commit dc4f59e664
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
web/pgadmin/static/js/slickgrid/editors.js
View File

@ -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) {