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 issue of opening query tool from new query tool icon beside connection status. #5575

Browse Source
This commit is contained in:
Yogesh Mahajan 2022-11-30 13:59:45 +05:30 committed by GitHub
parent c2637be03f
commit 9e078c0fa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
web/pgadmin/tools/sqleditor/static/js/show_query_tool.js
View File

@ -32,8 +32,8 @@ export function generateUrl(trans_id, parentData, sqlId) {
if(parentData.database.label) {
url_endpoint += `&database_name=${parentData.database.label}`;
}
if(parentData.server.user.name){
url_endpoint += `&user=${parentData.server.user.name}`;
if(!parentData.server.user_name && parentData.server.user?.name) {
url_endpoint += `&user=${parentData.server.user?.name}`;
}
}

5
web/pgadmin/tools/sqleditor/static/js/show_view_data.js
View File

@ -134,9 +134,12 @@ function generateUrl(trans_id, connectionData, nodeData, parentData) {
+`&sgid=${parentData.server_group._id}`
+`&sid=${parentData.server._id}`
+`&did=${parentData.database._id}`
+`&user=${parentData.server.user.name}`
+`&server_type=${parentData.server.server_type}`;
if(!parentData.server.user_name && parentData.server.user?.name) {
url_endpoint += `&user=${parentData.server.user?.name}`;
}
return url_endpoint;
}