IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

1) Fixed error in alertify.pgNotifier when server connection is lost.

Browse Source 
2) Change styling of alertify.pgNotifier as we did for success, error and info.
This commit is contained in:
Akshay Joshi 2017-08-31 18:02:03 +05:30
parent 2945b3fe93
commit 47cf874460
1 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
web/pgadmin/static/js/alertify.pgadmin.defaults.js
View File

@ -89,12 +89,12 @@ function(gettext, alertify, S) {
if (xhr.status == 0) { if (xhr.status == 0) {
msg = gettext('Connection to the server has been lost.'); msg = gettext('Connection to the server has been lost.');
} promptmsg = gettext('Connection Lost');
} else {
if (contentType) { if (contentType) {
try { try {
if (contentType.indexOf('application/json') == 0) { if (contentType.indexOf('application/json') == 0) {
var resp = $.parseJSON(msg); resp = $.parseJSON(msg);
if (resp.result != null && (!resp.errormsg || resp.errormsg == '') && if (resp.result != null && (!resp.errormsg || resp.errormsg == '') &&
onJSONResult && typeof(onJSONResult) == 'function') { onJSONResult && typeof(onJSONResult) == 'function') {
@ -103,11 +103,19 @@ function(gettext, alertify, S) {
msg = _.escape(resp.result) || _.escape(resp.errormsg) || "Unknown error"; msg = _.escape(resp.result) || _.escape(resp.errormsg) || "Unknown error";
} }
if (contentType.indexOf('text/html') == 0) { if (contentType.indexOf('text/html') == 0) {
var alertMessage = promptmsg;
if (type === 'error') {
alertMessage = '\
<div class="media font-red-3 text-14">\
<div class="media-body media-middle">\
<div class="alert-text">' + promptmsg + '</div><br/>\
<div class="alert-text">' + gettext('Click for details.') + '</div>\
</div>\
</div>';
}
alertify.notify( alertify.notify(
S( alertMessage, type, 0, function() {
'%s<br><br>' +
gettext('Click here for details.')
).sprintf(promptmsg).value(), type, 0, function() {
alertify.pgIframeDialog().show().set({frameless: false}).set( alertify.pgIframeDialog().show().set({frameless: false}).set(
'pg_msg', msg 'pg_msg', msg
); );
@ -118,6 +126,7 @@ function(gettext, alertify, S) {
alertify.alert().show().set('message', e.message).set('title', "Error"); alertify.alert().show().set('message', e.message).set('title', "Error");
} }
} }
}
alertify.alert().show().set( alertify.alert().show().set(
'message', msg.replace(new RegExp('\r?\n','g'), '<br />') 'message', msg.replace(new RegExp('\r?\n','g'), '<br />')
).set('title', promptmsg); ).set('title', promptmsg);