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

Ensure that the Query Tool connection string should not be changed as per the 'Query Tool tab title'. Fixes #6404

Browse Source
This commit is contained in:
Nikhil Mohite
2021-06-07 22:07:51 +05:30
committed by Akshay Joshi
parent d5f537aae4
commit e1067ffe67
8 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -110,7 +110,7 @@ define('tools.querytool', [
this.set_server_version(opts.server_ver);
this.trigger('pgadmin-sqleditor:view:initialised');
this.connection_list = [
{'server_group': null,'server': null, 'database': null, 'user': null, 'role': null, 'title': '<' + gettext('New Connection') + '>'},
{'server_group': null,'server': null, 'database': null, 'user': null, 'role': null, 'conn_title': '<' + gettext('New Connection') + '>'},
];
},
@@ -184,9 +184,9 @@ define('tools.querytool', [
data_list.forEach((option, index) => {
var opt = '';
if ('is_selected' in option && option['is_selected']) {
opt = '<li class="connection-list-item selected-connection" data-index='+ index +'><a class="dropdown-item" href="#" tabindex="0">'+ option.title +'</a></li>';
opt = '<li class="connection-list-item selected-connection" data-index='+ index +'><a class="dropdown-item" href="#" tabindex="0">'+ option.conn_title +'</a></li>';
} else {
opt = '<li class="connection-list-item" data-index='+ index +'><a class="dropdown-item" href="#" tabindex="0">'+ option.title +'</a></li>';
opt = '<li class="connection-list-item" data-index='+ index +'><a class="dropdown-item" href="#" tabindex="0">'+ option.conn_title +'</a></li>';
}
$('#connections-list').append(opt);
});
@@ -2284,7 +2284,7 @@ define('tools.querytool', [
'sid': connection_details['server'],
'title': connection_details['title'],
};
self.set_editor_title(_.unescape(self.handler.url_params.title));
self.set_editor_title(_.unescape(connection_details['conn_title']));
self.handler.setTitle(_.unescape(self.handler.url_params.title));
let success_msg = connection_details['server_name'] + '/' + connection_details['database_name'] + '- Database connected';
alertify.success(success_msg);
@@ -2295,6 +2295,7 @@ define('tools.querytool', [
'database': connection_details['database'],
'user': connection_details['user'],
'title': connection_details['title'],
'conn_title': connection_details['conn_title'],
'role': connection_details['role'],
'is_allow_new_connection': true,
'database_name': connection_details['database_name'],
@@ -2672,10 +2673,8 @@ define('tools.querytool', [
var server_data = pgWindow.default.pgAdmin.Browser.treeMenu.findNode(tree_data.slice(0,2));
var database_data = pgWindow.default.pgAdmin.Browser.treeMenu.findNode(tree_data.slice(0,4));
self.gridView.set_editor_title(_.unescape(url_params.title));
let conn_title = panelTitleFunc.getPanelTitle(pgWindow.default.pgAdmin.Browser, null, null, null, true);
self.gridView.set_editor_title(_.unescape(conn_title));
let connection_data = {
'server_group': self.gridView.handler.url_params.sgid,
'server': self.gridView.handler.url_params.sid,
@@ -2683,6 +2682,7 @@ define('tools.querytool', [
'user': server_data.data.user.name,
'role': null,
'title': _.unescape(url_params.title),
'conn_title': _.unescape(conn_title),
'is_allow_new_connection': false,
'database_name': _.unescape(database_data.data.label),
'server_name': _.unescape(server_data.data.label),