From 7fac72cac5afbf5f63be9c8da7abf872b1bf761a Mon Sep 17 00:00:00 2001 From: Rahul Shirsat Date: Thu, 10 Sep 2020 12:09:56 +0530 Subject: [PATCH] Fixed an issue where alert message should get displayed on active browser window. refs #4059 --- .../tools/sqleditor/static/js/sqleditor.js | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js index b0d5a118f..95ce1203b 100644 --- a/web/pgadmin/tools/sqleditor/static/js/sqleditor.js +++ b/web/pgadmin/tools/sqleditor/static/js/sqleditor.js @@ -8,6 +8,7 @@ ////////////////////////////////////////////////////////////// import {getTreeNodeHierarchyFromIdentifier} from 'sources/tree/pgadmin_tree_node'; +import {showQueryTool} from 'tools/datagrid/static/js/show_query_tool'; define('tools.querytool', [ 'sources/gettext', 'sources/url_for', 'jquery', 'jquery.ui', @@ -4317,14 +4318,16 @@ define('tools.querytool', [ _show_query_tool: function() { var self = this; - setTimeout(() => { - var tree_node = pgWindow.default.pgAdmin.selected_tree_map.get(self.url_params.did || self.url_params.sid); - if(self.preferences.new_browser_tab) { - is_main_window_alive(); - } + var tree_node = pgWindow.default.pgAdmin.selected_tree_map.get(self.url_params.did || self.url_params.sid); + if(self.preferences.new_browser_tab) { + is_main_window_alive(); + } + this._open_query_tool(tree_node); + }, - pgWindow.default.pgAdmin.DataGrid.show_query_tool('', tree_node.i); - }, 200); + _open_query_tool: function(tree_node) { + const transId = pgadminUtils.getRandomInt(1, 9999999); + showQueryTool(pgWindow.default.pgAdmin.DataGrid, pgWindow.default.pgAdmin.Browser, alertify, '', tree_node.i, transId); }, /*