mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2026-11-02 20:30:17 -06:00
Show proper message if the debugger is stopped by the user. #6059
This commit is contained in:
1 parent
c19fc3628c
commit
d98f411ea9
2 files changed
+12
-2
No files matched your search
@@ -736,6 +736,7 @@ export default function DebuggerArgumentComponent({ debuggerInfo, restartDebug,
|
|||||||
let panel = pgAdmin.Browser.docker.addPanel(
|
let panel = pgAdmin.Browser.docker.addPanel(
|
||||||
'frm_debugger', wcDocker.DOCK.STACKED, propertiesPanel[0]
|
'frm_debugger', wcDocker.DOCK.STACKED, propertiesPanel[0]
|
||||||
);
|
);
|
||||||
|
panel.trans_id = res_post.data.data.debuggerTransId;
|
||||||
let browser_pref = pgAdmin.Browser.get_preferences_for_module('browser');
|
let browser_pref = pgAdmin.Browser.get_preferences_for_module('browser');
|
||||||
let label = getAppropriateLabel(treeInfo);
|
let label = getAppropriateLabel(treeInfo);
|
||||||
setDebuggerTitle(panel, browser_pref, label, treeInfo.schema.label, treeInfo.database.label, null, pgAdmin.Browser);
|
setDebuggerTitle(panel, browser_pref, label, treeInfo.schema.label, treeInfo.database.label, null, pgAdmin.Browser);
|
||||||
|
|||||||
@@ -148,11 +148,20 @@ export default function DebuggerComponent({ pgAdmin, selectedNodeInfo, panel, ev
|
|||||||
try {
|
try {
|
||||||
let err = xhr.response.data;
|
let err = xhr.response.data;
|
||||||
if (err.success == 0) {
|
if (err.success == 0) {
|
||||||
Notify.alert(gettext('Debugger Error'), err.errormsg, () => {
|
let header_msg = gettext('Debugger Error'),
|
||||||
|
err_msg = err.errormsg;
|
||||||
|
|
||||||
|
// Stopped Debugger forcefully. 57014 is the SQL State
|
||||||
|
if (err.errormsg.indexOf('57014') !== -1) {
|
||||||
|
header_msg = gettext('Debugger Aborted');
|
||||||
|
err_msg = gettext('Debugger has been aborted. '
|
||||||
|
+ 'On clicking the ok button, debugger panel will be closed.');
|
||||||
|
}
|
||||||
|
|
||||||
|
Notify.alert(header_msg, err_msg, () => {
|
||||||
if (panel) {
|
if (panel) {
|
||||||
panel.close();
|
panel.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
|||||||
Reference in new issue
Block a user