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 an issue where JSON data would not be rendered in the Query Tool. Fixes #4105

Browse Source
This commit is contained in:
Aditya Toshniwal 2019-03-28 08:12:09 -04:00 committed by Dave Page
parent 6fb35f2649
commit fbc6aea497
2 changed files with 25 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_4_4.rst
View File

@ -58,4 +58,5 @@ Bug fixes
| `Bug #4090 <https://redmine.postgresql.org/issues/4090>`_ - Improve the German translation for Backup Server. | `Bug #4090 <https://redmine.postgresql.org/issues/4090>`_ - Improve the German translation for Backup Server.
| `Bug #4099 <https://redmine.postgresql.org/issues/4099>`_ - Fix SQL help for EPAS 10+, and refactor the URL generation code into a testable function. | `Bug #4099 <https://redmine.postgresql.org/issues/4099>`_ - Fix SQL help for EPAS 10+, and refactor the URL generation code into a testable function.
| `Bug #4100 <https://redmine.postgresql.org/issues/4100>`_ - Ensure sequences can be created with increment, start, minimum and maximum options set. | `Bug #4100 <https://redmine.postgresql.org/issues/4100>`_ - Ensure sequences can be created with increment, start, minimum and maximum options set.
| `Bug #4105 <https://redmine.postgresql.org/issues/4105>`_ - Fix an issue where JSON data would not be rendered in the Query Tool.
| `Bug #4109 <https://redmine.postgresql.org/issues/4109>`_ - Ensure View/Materialized View node should be visible after updating any property. | `Bug #4109 <https://redmine.postgresql.org/issues/4109>`_ - Ensure View/Materialized View node should be visible after updating any property.

2
web/pgadmin/tools/sqleditor/static/js/sqleditor.js
View File

@ -2422,6 +2422,7 @@ define('tools.querytool', [
if(data.types[0] && data.types[0].typname === 'json') { if(data.types[0] && data.types[0].typname === 'json') {
/* json is sent as text, parse it */ /* json is sent as text, parse it */
explain_data_json = JSON.parse(data.result[0]); explain_data_json = JSON.parse(data.result[0]);
}
if (explain_data_json && explain_data_json[0] && if (explain_data_json && explain_data_json[0] &&
explain_data_json[0].hasOwnProperty('Plan') && explain_data_json[0].hasOwnProperty('Plan') &&
@ -2446,7 +2447,6 @@ define('tools.querytool', [
); );
}, 10 }, 10
); );
}
} else { } else {
// Make sure - the 'Data Output' panel is visible, before - we // Make sure - the 'Data Output' panel is visible, before - we
// start rendering the grid. // start rendering the grid.