Fixed an issue where multiple errors were showing if user does not have connect privileges. #7073
parent
ad0567bd85
commit
b28df5874e
|
@ -421,7 +421,7 @@ define('pgadmin.node.database', [
|
||||||
setTimeout(function() {
|
setTimeout(function() {
|
||||||
if (msg == 'CRYPTKEY_SET') {
|
if (msg == 'CRYPTKEY_SET') {
|
||||||
connect_to_database(_model, _data, _tree, _item, _wasConnected);
|
connect_to_database(_model, _data, _tree, _item, _wasConnected);
|
||||||
} else {
|
} else if (msg != 'ALERT_CALLED') {
|
||||||
showServerPassword(
|
showServerPassword(
|
||||||
gettext('Connect to database'),
|
gettext('Connect to database'),
|
||||||
msg, _model, _data, _tree, _item, _status,
|
msg, _model, _data, _tree, _item, _status,
|
||||||
|
|
|
@ -164,7 +164,7 @@ class Notifier {
|
||||||
return onJSONResult();
|
return onJSONResult();
|
||||||
}
|
}
|
||||||
this.alert(promptmsg, msg.replace(new RegExp(/\r?\n/, 'g'), '<br />'));
|
this.alert(promptmsg, msg.replace(new RegExp(/\r?\n/, 'g'), '<br />'));
|
||||||
onJSONResult();
|
onJSONResult('ALERT_CALLED');
|
||||||
}
|
}
|
||||||
|
|
||||||
alert(title, text, onOkClick, okLabel=gettext('OK')) {
|
alert(title, text, onOkClick, okLabel=gettext('OK')) {
|
||||||
|
|
Loading…
Reference in New Issue