IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix JSON type rendering. Fixes #1404

Browse Source
This commit is contained in:
Murtuza Zabuawala 2016-07-04 10:05:59 +01:00 committed by Dave Page
parent d4c3b1bcff
commit 3ee8861d44
2 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
web/pgadmin/static/js/backgrid/backgrid.pgadmin.js
View File

@ -904,6 +904,40 @@
}
});
/*
* JSONBCell Formatter.
*/
var JSONBCellFormatter = Backgrid.Extension.JSONBCellFormatter =
function () {};
_.extend(JSONBCellFormatter.prototype, {
fromRaw: function (rawData, model) {
// json data
if(_.isArray(rawData)) {
var converted_data = '';
converted_data = _.map(rawData, function(data) {
return JSON.stringify(JSON.stringify(data));
});
return '{' + converted_data.join() + '}';
} else if(_.isObject(rawData)) {
return JSON.stringify(rawData);
} else {
return rawData;
}
},
toRaw: function (formattedData, model) {
return formattedData;
}
});
/*
* JSONBCell for backgrid.
*/
var JSONBCell = Backgrid.Extension.JSONBCell =
Backgrid.StringCell.extend({
className: "jsonb-cell",
formatter: JSONBCellFormatter
});
return Backgrid;
}));

6
web/pgadmin/tools/sqleditor/templates/sqleditor/js/sqleditor.js
View File

@ -1555,6 +1555,12 @@ define(
case "timestamp with time zone":
col_cell = 'datetime';
break;
case "json":
case "json[]":
case "jsonb":
case "jsonb[]":
col_cell = Backgrid.Extension.JSONBCell;
break;
default:
col_cell = 'string';
}