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

Properly report errors when debugging cannot be started. Fixes #3723

pull/11/head
Akshay Joshi 2018-11-15 15:18:12 -05:00 committed by Dave Page
parent 9b0889842d
commit ef68cae1f1
2 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/en_US/release_notes_3_6.rst
View File

@ -18,4 +18,5 @@ Bug fixes
| `Bug #3016 <https://redmine.postgresql.org/issues/3016>`_ - Ensure previous notices are not removed from the Messages tab in the Query Tool if an error occurs during query execution. | `Bug #3016 <https://redmine.postgresql.org/issues/3016>`_ - Ensure previous notices are not removed from the Messages tab in the Query Tool if an error occurs during query execution.
| `Bug #3029 <https://redmine.postgresql.org/issues/3029>`_ - Allow the selection order to be preserved in the Select2 control to fix column ordering in data Import/Export. | `Bug #3029 <https://redmine.postgresql.org/issues/3029>`_ - Allow the selection order to be preserved in the Select2 control to fix column ordering in data Import/Export.
| `Bug #3629 <https://redmine.postgresql.org/issues/3629>`_ - Allow use of 0 (integer) and empty strings as parameters in the debugger. | `Bug #3629 <https://redmine.postgresql.org/issues/3629>`_ - Allow use of 0 (integer) and empty strings as parameters in the debugger.
| `Bug #3723 <https://redmine.postgresql.org/issues/3723>`_ - Properly report errors when debugging cannot be started.
| `Bug #3746 <https://redmine.postgresql.org/issues/3746>`_ - Fix dropping of multiple functions/procedures at once. | `Bug #3746 <https://redmine.postgresql.org/issues/3746>`_ - Fix dropping of multiple functions/procedures at once.

34
web/pgadmin/tools/debugger/static/js/direct.js
View File

@ -1565,11 +1565,18 @@ define([
controller.poll_result(trans_id); controller.poll_result(trans_id);
} }
}) })
.fail(function() { .fail(function(xhr) {
Alertify.alert( try {
gettext('Debugger Error'), var err = JSON.parse(xhr.responseText);
gettext('Error while starting debugging listener.') if (err.success == 0) {
); Alertify.alert(gettext('Debugger Error'), err.errormsg);
}
} catch (e) {
Alertify.alert(
gettext('Debugger Error'),
gettext('Error while starting debugging listener.')
);
}
}); });
} else if (trans_id != undefined && debug_type) { } else if (trans_id != undefined && debug_type) {
// Make ajax call to execute the and start the target for execution // Make ajax call to execute the and start the target for execution
@ -1586,11 +1593,18 @@ define([
self.messages(trans_id); self.messages(trans_id);
} }
}) })
.fail(function() { .fail(function(xhr) {
Alertify.alert( try {
gettext('Debugger Error'), var err = JSON.parse(xhr.responseText);
gettext('Error while starting debugging listener.') if (err.success == 0) {
); Alertify.alert(gettext('Debugger Error'), err.errormsg);
}
} catch (e) {
Alertify.alert(
gettext('Debugger Error'),
gettext('Error while starting debugging listener.')
);
}
}); });
} else } else
this.intializePanels(); this.intializePanels();