Show proper message if the debugger is stopped by the user. #6059
parent
c19fc3628c
commit
d98f411ea9
|
@ -736,6 +736,7 @@ export default function DebuggerArgumentComponent({ debuggerInfo, restartDebug,
|
|||
let panel = pgAdmin.Browser.docker.addPanel(
|
||||
'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 label = getAppropriateLabel(treeInfo);
|
||||
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 {
|
||||
let err = xhr.response.data;
|
||||
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) {
|
||||
panel.close();
|
||||
}
|
||||
|
||||
});
|
||||
}
|
||||
} catch (e) {
|
||||
|
|
Loading…
Reference in New Issue