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

Fixed an issue where data is displayed in the wrong order when executing the query repeatedly. Fixes #5555

Browse Source
This commit is contained in:
Rahul Shirsat 2021-04-29 13:13:52 +05:30 committed by Akshay Joshi
parent e718be72e3
commit 488dc1849d
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_5_3.rst
View File

@ -17,6 +17,7 @@ Housekeeping
Bug fixes Bug fixes
********* *********
| `Issue #5555 <https://redmine.postgresql.org/issues/5555>`_ - Fixed an issue where data is displayed in the wrong order when executing the query repeatedly.
| `Issue #6329 <https://redmine.postgresql.org/issues/6329>`_ - Fixed an issue where the wrong SQL is showing for the child partition tables. | `Issue #6329 <https://redmine.postgresql.org/issues/6329>`_ - Fixed an issue where the wrong SQL is showing for the child partition tables.
| `Issue #6341 <https://redmine.postgresql.org/issues/6341>`_ - Fixed an issue where CSV download quotes the numeric columns. | `Issue #6341 <https://redmine.postgresql.org/issues/6341>`_ - Fixed an issue where CSV download quotes the numeric columns.
| `Issue #6355 <https://redmine.postgresql.org/issues/6355>`_ - Ensure that pgAdmin should not allow opening external files that are dragged into it. | `Issue #6355 <https://redmine.postgresql.org/issues/6355>`_ - Ensure that pgAdmin should not allow opening external files that are dragged into it.

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

@ -1427,7 +1427,9 @@ define('tools.querytool', [
}) })
.done(function(res) { .done(function(res) {
self.handler.has_more_rows = res.data.has_more_rows; self.handler.has_more_rows = res.data.has_more_rows;
$('#btn-flash').prop('disabled', false); setTimeout(() => {
$('#btn-flash').prop('disabled', false);
}, 700);
$('#btn-save-results-to-file').prop('disabled', false); $('#btn-save-results-to-file').prop('disabled', false);
self.handler.trigger('pgadmin-sqleditor:loading-icon:hide'); self.handler.trigger('pgadmin-sqleditor:loading-icon:hide');
self.update_grid_data(res.data.result); self.update_grid_data(res.data.result);
@ -1823,6 +1825,7 @@ define('tools.querytool', [
// Callback function for the flash button click. // Callback function for the flash button click.
on_flash: function() { on_flash: function() {
$('#btn-flash').prop('disabled', true);
let data_click_counter = $('#btn-flash').attr('data-click-counter'); let data_click_counter = $('#btn-flash').attr('data-click-counter');
data_click_counter = (parseInt(data_click_counter) + 1)%10; data_click_counter = (parseInt(data_click_counter) + 1)%10;
$('#btn-flash').attr('data-click-counter', data_click_counter); $('#btn-flash').attr('data-click-counter', data_click_counter);
@ -3109,7 +3112,8 @@ define('tools.querytool', [
// Hide the loading icon // Hide the loading icon
self_col.trigger('pgadmin-sqleditor:loading-icon:hide'); self_col.trigger('pgadmin-sqleditor:loading-icon:hide');
$('#btn-flash').prop('disabled', false);
// Enable/Disable download button based on query result
if (!_.isUndefined(data) && Array.isArray(data.result) && data.result.length > 0) { if (!_.isUndefined(data) && Array.isArray(data.result) && data.result.length > 0) {
self.enable_disable_download_btn(false); self.enable_disable_download_btn(false);
} }
@ -3295,7 +3299,10 @@ define('tools.querytool', [
} }
if (status != 'Busy') { if (status != 'Busy') {
$('#btn-flash').prop('disabled', false); setTimeout(() => {
$('#btn-flash').prop('disabled', false);
}, 400);
self.trigger('pgadmin-sqleditor:loading-icon:hide'); self.trigger('pgadmin-sqleditor:loading-icon:hide');
if(!self.total_time) { if(!self.total_time) {