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

1) Fixed internal server error when clicking on the open new query tool button

Browse Source 
from the View/Edit Data window. Fixes #5831
2) Fixed schema diff panel title issue on new tab.
This commit is contained in:
Rahul Shirsat
2020-09-14 17:42:59 +05:30
committed by Akshay Joshi
parent cea41cb4a9
commit 8029d9e65e
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
web/pgadmin/tools/schema_diff/templates/schema_diff/index.html
View File

@@ -21,6 +21,7 @@ try {
{% block css_link %}
<link type="text/css" rel="stylesheet" href="{{ url_for('browser.browser_css')}}"/>
{% endblock %}
{% block title %}{{editor_title}}{% endblock %}
{% block body %}
<div id="schema-diff-container">
<div id="diff_fetching_data" class="pg-sp-container schema-diff-busy-fetching d-none">

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

@@ -4302,13 +4302,24 @@ define('tools.querytool', [
'trans_id': transId,
});
url_endpoint += `?is_query_tool=${that.url_params.is_query_tool}`
url_endpoint += `?is_query_tool=${true}`
+`&sgid=${that.url_params.sgid}`
+`&sid=${that.url_params.sid}`
+`&server_type=${that.url_params.server_type}`
+`&did=${that.url_params.did}`;
+`&server_type=${that.url_params.server_type}`;
launchDataGrid(pgWindow.default.pgAdmin.DataGrid, transId, url_endpoint, that.url_params.title, '', alertify);
if(that.url_params.did) {
url_endpoint += `&did=${that.url_params.did}`;
}
let panel_title = that.url_params.title;
if(that.url_params.is_query_tool == 'false') {//check whether query tool is hit from View/Edit
var split_title = that.url_params.title.split('/');
if(split_title.length > 2) {
panel_title = split_title[split_title.length-2] + '/' + split_title[split_title.length-1];
}
}
launchDataGrid(pgWindow.default.pgAdmin.DataGrid, transId, url_endpoint, panel_title, '', alertify);
},
/*