diff --git a/web/pgadmin/tools/datagrid/static/js/datagrid_panel_title.js b/web/pgadmin/tools/datagrid/static/js/datagrid_panel_title.js
index d468c83..258e83d 100644
--- a/web/pgadmin/tools/datagrid/static/js/datagrid_panel_title.js
+++ b/web/pgadmin/tools/datagrid/static/js/datagrid_panel_title.js
@@ -47,7 +47,7 @@ export function getPanelTitle(pgBrowser, selected_item=null, custom_title=null)
};
var title = generateTitle(qt_title_placeholder, title_data);
- return _.escape(title);
+ return title;
}
export function setQueryToolDockerTitle(panel, is_query_tool, panel_title, is_file) {
diff --git a/web/pgadmin/tools/datagrid/static/js/show_data.js b/web/pgadmin/tools/datagrid/static/js/show_data.js
index 959fae0..28ca801 100644
--- a/web/pgadmin/tools/datagrid/static/js/show_data.js
+++ b/web/pgadmin/tools/datagrid/static/js/show_data.js
@@ -308,5 +308,5 @@ export function generateDatagridTitle(pgBrowser, aciTreeIdentifier, custom_title
};
var title = generateTitle(dtg_title_placeholder, title_data);
- return _.escape(title);
+ return title;
}
diff --git a/web/pgadmin/tools/debugger/__init__.py b/web/pgadmin/tools/debugger/__init__.py
index ac61432..1e79c8d 100644
--- a/web/pgadmin/tools/debugger/__init__.py
+++ b/web/pgadmin/tools/debugger/__init__.py
@@ -35,6 +35,7 @@ from pgadmin.browser.server_groups.servers.databases.extensions.utils \
import get_extension_details
from pgadmin.utils.constants import PREF_LABEL_DISPLAY, \
PREF_LABEL_KEYBOARD_SHORTCUTS, MIMETYPE_APP_JS, SERVER_CONNECTION_CLOSED
+from pgadmin.preferences import preferences
MODULE_NAME = 'debugger'
@@ -601,10 +602,19 @@ def direct_new(trans_id):
function_name_with_arguments = \
de_inst.debugger_data['function_name'] + function_arguments
+ manager = get_driver(PG_DEFAULT_DRIVER).get_connection(
+ de_inst.debugger_data['server_id'],
+ database=de_inst.debugger_data['database_id'],
+ conn_id=de_inst.debugger_data['conn_id'])
+ title = get_debugger_title(de_inst.debugger_data['function_name'],
+ function_arguments,
+ de_inst.function_data['schema'], manager.db)
+
return render_template(
"debugger/direct.html",
_=gettext,
function_name=de_inst.debugger_data['function_name'],
+ title=title,
uniqueId=trans_id,
debug_type=debug_type,
is_desktop_mode=current_app.PGADMIN_RUNTIME,
@@ -615,6 +625,19 @@ def direct_new(trans_id):
)
+def get_debugger_title(function_name, args, schema, database):
+ browser_pref = preferences('browser', 'debugger_tab_title_placeholder')
+ placeholders = browser_pref.json['value']
+ title = placeholders.replace('%FUNCTION%', function_name)
+ if title.find('%ARGS%') != -1:
+ args = args.split('(')[-1][:-1]
+ title = title.replace('%ARGS%', args)
+ title = title.replace('%SCHEMA%', schema)
+ title = title.replace('%DATABASE%', database)
+
+ return title
+
+
def get_debugger_version(conn, search_path):
"""
Function returns the debugger version.
diff --git a/web/pgadmin/tools/debugger/static/js/debugger_utils.js b/web/pgadmin/tools/debugger/static/js/debugger_utils.js
index f835f18..e627c20 100644
--- a/web/pgadmin/tools/debugger/static/js/debugger_utils.js
+++ b/web/pgadmin/tools/debugger/static/js/debugger_utils.js
@@ -68,7 +68,7 @@ function setDebuggerTitle(panel, preferences, function_name, schema_name, databa
'type': 'debugger',
};
var title = generateTitle(debugger_title_placeholder, title_data);
- panel.title(''+ _.escape(title) +'');
+ panel.title(''+ title +'');
}
function get_function_name(function_name) {
diff --git a/web/pgadmin/tools/debugger/templates/debugger/direct.html b/web/pgadmin/tools/debugger/templates/debugger/direct.html
index bcdc80f..a73f79b 100644
--- a/web/pgadmin/tools/debugger/templates/debugger/direct.html
+++ b/web/pgadmin/tools/debugger/templates/debugger/direct.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% block title %}{{ _('Debugger - ') + function_name }}{% endblock %}
+{% block title %}{{ _('Debugger - ') + title }}{% endblock %}
{% block init_script %}
try {