Hi,
PFA patch to remove default 'Altertify JS' header from debugger related
error notifications.
RM#2098
Also fixed similar issue in other modules.
--
Regards,
Murtuza Zabuawala
EnterpriseDB: http://www.enterprisedb.com
The Enterprise PostgreSQL Company
diff --git a/web/pgadmin/tools/debugger/static/js/debugger.js
b/web/pgadmin/tools/debugger/static/js/debugger.js
index d8df30c..f905044 100644
--- a/web/pgadmin/tools/debugger/static/js/debugger.js
+++ b/web/pgadmin/tools/debugger/static/js/debugger.js
@@ -208,7 +208,7 @@ define([
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- Alertify.alert(err.errormsg);
+ Alertify.alert(gettext('Debugger Error'), err.errormsg);
}
} catch (e) {}
}
@@ -324,7 +324,7 @@ define([
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- Alertify.alert(err.errormsg);
+ Alertify.alert(gettext('Debugger Error'), err.errormsg);
}
} catch (e) {}
}
diff --git a/web/pgadmin/tools/debugger/static/js/debugger_ui.js
b/web/pgadmin/tools/debugger/static/js/debugger_ui.js
index 4460e3e..ecb7e87 100644
--- a/web/pgadmin/tools/debugger/static/js/debugger_ui.js
+++ b/web/pgadmin/tools/debugger/static/js/debugger_ui.js
@@ -211,7 +211,8 @@ define([
},
error: function(e) {
Alertify.alert(
- gettext('Debugger Set Arguments Error')
+ gettext('Debugger Error'),
+ gettext('Unable to fetch the arguments from server')
);
}
});
@@ -662,7 +663,8 @@ define([
},
error: function(e) {
Alertify.alert(
- gettext('Debugger Set arguments error')
+ gettext('Debugger Error'),
+ gettext('Unable to set the arguments on the server')
);
}
});
@@ -708,7 +710,8 @@ define([
},
error: function(e) {
Alertify.alert(
- gettext('Debugger Set Arguments Error')
+ gettext('Debugger Error'),
+ gettext('Unable to set the arguments on the server')
);
}
});
diff --git a/web/pgadmin/tools/debugger/static/js/direct.js
b/web/pgadmin/tools/debugger/static/js/direct.js
index 96637eb..640bcf2 100644
--- a/web/pgadmin/tools/debugger/static/js/direct.js
+++ b/web/pgadmin/tools/debugger/static/js/direct.js
@@ -660,7 +660,7 @@ define([
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- Alertify.alert(err.errormsg);
+ Alertify.alert(gettext('Debugger Error'), err.errormsg);
}
} catch (e) {}
}
diff --git a/web/pgadmin/tools/backup/static/js/backup.js
b/web/pgadmin/tools/backup/static/js/backup.js
index 2d24b89..a6fbafe 100644
--- a/web/pgadmin/tools/backup/static/js/backup.js
+++ b/web/pgadmin/tools/backup/static/js/backup.js
@@ -380,7 +380,10 @@ TODO LIST FOR BACKUP:
if (pgBrowser.tree.hasParent(i)) {
i = $(pgBrowser.tree.parent(i));
} else {
- alertify.alert(gettext("Please select server or child node from
the browser tree."));
+ alertify.alert(
+ gettext("Backup Error"),
+ gettext("Please select server or child node from the browser
tree.")
+ );
break;
}
}
@@ -407,7 +410,10 @@ TODO LIST FOR BACKUP:
return;
}
} else {
- alertify.alert(S(gettext('Failed to load preference %s of module
%s')).sprintf(preference_name, module).value());
+ alertify.alert(
+ gettext('Backup Error'),
+ S(gettext('Failed to load preference %s of module
%s')).sprintf(preference_name, module).value()
+ );
return;
}
@@ -595,7 +601,10 @@ TODO LIST FOR BACKUP:
if (pgBrowser.tree.hasParent(i)) {
i = $(pgBrowser.tree.parent(i));
} else {
- alertify.alert(gettext("Please select server or child node from
tree."));
+ alertify.alert(
+ gettext("Backup Error"),
+ gettext("Please select server or child node from tree.")
+ );
break;
}
}
@@ -618,11 +627,14 @@ TODO LIST FOR BACKUP:
if(preference) {
if (!preference.value) {
- alertify.alert(msg);
+ alertify.alert(gettext('Configuration required'), msg);
return;
}
} else {
- alertify.alert(S(gettext('Failed to load preference %s of module
%s')).sprintf(preference_name, module).value());
+ alertify.alert(
+ gettext('Backup Error'),
+ S(gettext('Failed to load preference %s of module
%s')).sprintf(preference_name, module).value()
+ );
return;
}
diff --git a/web/pgadmin/tools/datagrid/static/js/datagrid.js
b/web/pgadmin/tools/datagrid/static/js/datagrid.js
index 3e03006..c44fbb1 100644
--- a/web/pgadmin/tools/datagrid/static/js/datagrid.js
+++ b/web/pgadmin/tools/datagrid/static/js/datagrid.js
@@ -423,6 +423,7 @@ define('pgadmin.datagrid', [
},
error: function(e) {
alertify.alert(
+ gettext('Error'),
gettext('Query Tool Initialization Error')
);
}
diff --git a/web/pgadmin/tools/debugger/static/js/direct.js
b/web/pgadmin/tools/debugger/static/js/direct.js
index 96637eb..640bcf2 100644
--- a/web/pgadmin/tools/debugger/static/js/direct.js
+++ b/web/pgadmin/tools/debugger/static/js/direct.js
@@ -660,7 +660,7 @@ define([
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- Alertify.alert(err.errormsg);
+ Alertify.alert(gettext('Debugger Error'), err.errormsg);
}
} catch (e) {}
}
diff --git a/web/pgadmin/tools/restore/static/js/restore.js
b/web/pgadmin/tools/restore/static/js/restore.js
index f5c1bab..7160f51 100644
--- a/web/pgadmin/tools/restore/static/js/restore.js
+++ b/web/pgadmin/tools/restore/static/js/restore.js
@@ -310,7 +310,10 @@ define('tools.restore', [
if (pgBrowser.tree.hasParent(i)) {
i = $(pgBrowser.tree.parent(i));
} else {
- alertify.alert(gettext("Please select server or child node from
tree."));
+ alertify.alert(
+ gettext("Restore Error"),
+ gettext("Please select server or child node from tree.")
+ );
break;
}
}
@@ -337,7 +340,10 @@ define('tools.restore', [
return;
}
} else {
- alertify.alert(S(gettext('Failed to load preference %s of module
%s')).sprintf(preference_name, module).value());
+ alertify.alert(
+ gettext("Restore Error"),
+ S(gettext('Failed to load preference %s of module
%s')).sprintf(preference_name, module).value()
+ );
return;
}
diff --git a/web/pgadmin/tools/user_management/static/js/user_management.js
b/web/pgadmin/tools/user_management/static/js/user_management.js
index bd14ce1..d51d6b4 100644
--- a/web/pgadmin/tools/user_management/static/js/user_management.js
+++ b/web/pgadmin/tools/user_management/static/js/user_management.js
@@ -408,7 +408,9 @@ define([
);
}
} else {
- alertify.alert(gettext("This user cannot be deleted."),
+ alertify.alert(
+ gettext("Error"),
+ gettext("This user cannot be deleted."),
function(){
return true;
}
@@ -627,7 +629,10 @@ define([
},
error: function(e) {
setTimeout(function() {
- alertify.alert(gettext('Cannot load user roles.'));
+ alertify.alert(
+ gettext('Error'),
+ gettext('Cannot load user roles.')
+ );
},100);
}
});
