pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added extra check for verifying the rename of the database. 

refs #4203
pull/51/head
Rahul Shirsat 2021-06-07 21:11:28 +05:30 committed by Akshay Joshi
parent 5b12483416
commit d5f537aae4
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/pgadmin/tools/sqleditor/__init__.py
View File

@ -505,6 +505,8 @@ def poll(trans_id):
transaction_status = conn.transaction_status() transaction_status = conn.transaction_status()
data_obj['db_name'] = conn.db data_obj['db_name'] = conn.db
data_obj['db_id'] = trans_obj.did \
if trans_obj is not None and hasattr(trans_obj, 'did') else 0
return make_json_response( return make_json_response(
data={ data={

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

@ -5125,9 +5125,10 @@ define('tools.querytool', [
tree_data = pgWindow.default.pgAdmin.Browser.treeMenu.translateTreeNodeIdFromACITree(selected_item), tree_data = pgWindow.default.pgAdmin.Browser.treeMenu.translateTreeNodeIdFromACITree(selected_item),
server_data = pgWindow.default.pgAdmin.Browser.treeMenu.findNode(tree_data.slice(0,2)), server_data = pgWindow.default.pgAdmin.Browser.treeMenu.findNode(tree_data.slice(0,2)),
database_data = pgWindow.default.pgAdmin.Browser.treeMenu.findNode(tree_data.slice(0,4)), database_data = pgWindow.default.pgAdmin.Browser.treeMenu.findNode(tree_data.slice(0,4)),
db_name = database_data.data.label; db_name = database_data.data.label,
db_did = database_data.data._id;
if(!_.isEqual(db_name, data.data_obj.db_name)) { if(data.data_obj.db_id == db_did && !_.isEqual(db_name, data.data_obj.db_name)) {
var message = `Current database has been moved or renamed to ${data.data_obj.db_name}. Click on the OK button to refresh the database name.`, var message = `Current database has been moved or renamed to ${data.data_obj.db_name}. Click on the OK button to refresh the database name.`,
title = self.url_params.title; title = self.url_params.title;