diff --git a/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.js b/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.js
index dded4d7..057c0cf 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.js
@@ -1,10 +1,7 @@
define('pgadmin.node.cast', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'underscore.string', 'pgadmin',
- 'pgadmin.browser', 'alertify',
- 'sources/alerts/alertify_wrapper',
-
- 'pgadmin.browser.collection'
-], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify, AlertifyWrapper) {
+ 'pgadmin.browser', 'pgadmin.alertifyjs', 'pgadmin.browser.collection'
+], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {
// Extend the collection class for cast
if (!pgBrowser.Nodes['coll-cast']) {
var casts = pgAdmin.Browser.Nodes['coll-cast'] =
@@ -215,8 +212,7 @@ define('pgadmin.node.cast', [
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(err.errormsg);
+ alertify.error(err.errormsg);
}
} catch (e) {}
}
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js
index 0dc11da..2e1984a 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js
@@ -1,10 +1,8 @@
define('pgadmin.node.synonym', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
- 'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify',
- 'sources/alerts/alertify_wrapper',
-
+ 'underscore.string', 'pgadmin', 'pgadmin.browser', 'pgadmin.alertifyjs',
'pgadmin.browser.collection'
-], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify, AlertifyWrapper) {
+], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {
if (!pgBrowser.Nodes['coll-synonym']) {
var databases = pgAdmin.Browser.Nodes['coll-synonym'] =
@@ -169,8 +167,7 @@ define('pgadmin.node.synonym', [
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(err.errormsg);
+ alertify.error(err.errormsg);
}
} catch (e) {}
}
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js
index 52a197e..0bd9e2c 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/static/js/check_constraint.js
@@ -1,11 +1,9 @@
// Check Constraint Module: Node
define('pgadmin.node.check_constraint', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
- 'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify',
- 'sources/alerts/alertify_wrapper',
-
+ 'underscore.string', 'pgadmin', 'pgadmin.browser', 'pgadmin.alertifyjs',
'pgadmin.browser.collection'
-], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Alertify, AlertifyWrapper) {
+], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {
// Check Constraint Node
if (!pgBrowser.Nodes['check_constraints']) {
@@ -66,8 +64,7 @@ define('pgadmin.node.check_constraint', [
type:'GET',
success: function(res) {
if (res.success == 1) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.success(res.info);
+ alertify.success(res.info);
t.removeIcon(i);
data.valid = true;
data.icon = 'icon-check_constraints';
@@ -80,8 +77,7 @@ define('pgadmin.node.check_constraint', [
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(err.errormsg);
+ alertify.error(err.errormsg);
}
} catch (e) {}
t.unload(i);
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js
index 7d74263..ae75d5e 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/static/js/foreign_key.js
@@ -1,10 +1,8 @@
define('pgadmin.node.foreign_key', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
- 'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify',
- 'sources/alerts/alertify_wrapper',
-
+ 'underscore.string', 'pgadmin', 'pgadmin.browser', 'pgadmin.alertifyjs',
'pgadmin.browser.collection'
-], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Alertify, AlertifyWrapper) {
+], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {
var formatNode = function(opt) {
if (!opt.id) {
@@ -655,8 +653,7 @@ define('pgadmin.node.foreign_key', [
type:'GET',
success: function(res) {
if (res.success == 1) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.success(res.info);
+ alertify.success(res.info);
t.removeIcon(i);
data.valid = true;
data.icon = 'icon-foreign_key';
@@ -669,8 +666,7 @@ define('pgadmin.node.foreign_key', [
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(err.errormsg);
+ alertify.error(err.errormsg);
}
} catch (e) {}
t.unload(i);
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js
index a86372e..e1959b0 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/partitions/static/js/partition.js
@@ -1,10 +1,9 @@
define([
'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
- 'underscore.string', 'pgadmin', 'pgadmin.browser', 'backform', 'alertify',
- 'sources/alerts/alertify_wrapper',
+ 'underscore.string', 'pgadmin', 'pgadmin.browser', 'backform', 'pgadmin.alertifyjs',
'pgadmin.browser.collection', 'pgadmin.browser.table.partition.utils'
],
-function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify, AlertifyWrapper) {
+function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify) {
if (!pgBrowser.Nodes['coll-partition']) {
var databases = pgAdmin.Browser.Nodes['coll-partition'] =
@@ -164,8 +163,7 @@ function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify, Aler
dataType: "json",
success: function(res) {
if (res.success == 1) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.success(res.info);
+ alertify.success(res.info);
t.unload(i);
t.setInode(i);
t.deselect(i);
@@ -178,8 +176,7 @@ function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify, Aler
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(err.errormsg);
+ alertify.error(err.errormsg);
}
} catch (e) {}
t.unload(i);
@@ -219,8 +216,7 @@ function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify, Aler
dataType: "json",
success: function(res) {
if (res.success == 1) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.success(res.info);
+ alertify.success(res.info);
t.removeIcon(i);
data.icon = 'icon-partition';
t.addIcon(i, {icon: data.icon});
@@ -237,8 +233,7 @@ function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify, Aler
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(err.errormsg);
+ alertify.error(err.errormsg);
}
} catch (e) {}
t.unload(i);
@@ -269,8 +264,7 @@ function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify, Aler
type:'DELETE',
success: function(res) {
if (res.success == 1) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.success(res.info);
+ alertify.success(res.info);
t.removeIcon(i);
data.icon = 'icon-partition';
t.addIcon(i, {icon: data.icon});
@@ -287,8 +281,7 @@ function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify, Aler
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(err.errormsg);
+ alertify.error(err.errormsg);
}
} catch (e) {}
t.unload(i);
@@ -320,8 +313,7 @@ function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify, Aler
type:'PUT',
success: function(res) {
if (res.success == 1) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.success(res.info);
+ alertify.success(res.info);
var n = t.next(i);
if (!n || !n.length) {
n = t.prev(i);
@@ -340,8 +332,7 @@ function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify, Aler
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(err.errormsg);
+ alertify.error(err.errormsg);
}
} catch (e) {}
}
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js
index 2bbd924..75e0de6 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js
@@ -1,12 +1,10 @@
define('pgadmin.node.table', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
- 'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify',
- 'sources/alerts/alertify_wrapper',
+ 'underscore.string', 'pgadmin', 'pgadmin.browser', 'pgadmin.alertifyjs',
'pgadmin.browser.collection', 'pgadmin.node.column',
'pgadmin.node.constraints', 'pgadmin.browser.table.partition.utils'
], function(
- gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify, AlertifyWrapper
-) {
+ gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {
if (!pgBrowser.Nodes['coll-table']) {
var databases = pgBrowser.Nodes['coll-table'] =
@@ -129,8 +127,7 @@ define('pgadmin.node.table', [
dataType: "json",
success: function(res) {
if (res.success == 1) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.success(res.info);
+ alertify.success(res.info);
t.unload(i);
t.setInode(i);
t.deselect(i);
@@ -143,8 +140,7 @@ define('pgadmin.node.table', [
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(err.errormsg);
+ alertify.error(err.errormsg);
}
} catch (e) {}
t.unload(i);
@@ -184,8 +180,7 @@ define('pgadmin.node.table', [
dataType: "json",
success: function(res) {
if (res.success == 1) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.success(res.info);
+ alertify.success(res.info);
t.removeIcon(i);
data.icon = data.is_partitioned ? 'icon-partition': 'icon-table';
t.addIcon(i, {icon: data.icon});
@@ -202,8 +197,7 @@ define('pgadmin.node.table', [
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(err.errormsg);
+ alertify.error(err.errormsg);
}
} catch (e) {}
t.unload(i);
@@ -234,8 +228,7 @@ define('pgadmin.node.table', [
type:'DELETE',
success: function(res) {
if (res.success == 1) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.success(res.info);
+ alertify.success(res.info);
t.removeIcon(i);
data.icon = data.is_partitioned ? 'icon-partition': 'icon-table';
t.addIcon(i, {icon: data.icon});
@@ -252,8 +245,7 @@ define('pgadmin.node.table', [
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(err.errormsg);
+ alertify.error(err.errormsg);
}
} catch (e) {}
t.unload(i);
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js
index 87f1eb3..188578a 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/static/js/trigger.js
@@ -1,9 +1,8 @@
define('pgadmin.node.trigger', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
- 'underscore.string', 'pgadmin', 'pgadmin.browser', 'backform', 'alertify',
- 'sources/alerts/alertify_wrapper',
+ 'underscore.string', 'pgadmin', 'pgadmin.browser', 'backform', 'pgadmin.alertifyjs',
'pgadmin.browser.collection'
-], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify, AlertifyWrapper) {
+], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify) {
var CustomSwitchControl = Backform.CustomSwitchControl = Backform.SwitchControl.extend({
template: _.template([
@@ -118,8 +117,7 @@ define('pgadmin.node.trigger', [
dataType: "json",
success: function(res) {
if (res.success == 1) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.success(res.info);
+ alertify.success(res.info);
t.removeIcon(i);
data.icon = 'icon-trigger';
t.addIcon(i, {icon: data.icon});
@@ -136,8 +134,7 @@ define('pgadmin.node.trigger', [
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(err.errormsg);
+ alertify.error(err.errormsg);
}
} catch (e) {}
t.unload(i);
@@ -163,8 +160,7 @@ define('pgadmin.node.trigger', [
dataType: "json",
success: function(res) {
if (res.success == 1) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.success(res.info);
+ alertify.success(res.info);
t.removeIcon(i);
data.icon = 'icon-trigger-bad';
t.addIcon(i, {icon: data.icon});
@@ -181,8 +177,7 @@ define('pgadmin.node.trigger', [
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(err.errormsg);
+ alertify.error(err.errormsg);
}
} catch (e) {}
t.unload(i);
diff --git a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js
index 2273326..f3439e0 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js
@@ -1,10 +1,8 @@
define('pgadmin.node.mview', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
- 'underscore.string', 'pgadmin', 'alertify', 'pgadmin.browser', 'codemirror',
- 'sources/alerts/alertify_wrapper',
-
+ 'underscore.string', 'pgadmin', 'pgadmin.alertifyjs', 'pgadmin.browser', 'codemirror',
'pgadmin.browser.server.privilege'
-], function(gettext, url_for, $, _, S, pgAdmin, alertify, pgBrowser, CodeMirror, AlertifyWrapper) {
+], function(gettext, url_for, $, _, S, pgAdmin, alertify, pgBrowser, CodeMirror) {
/**
Create and add a view collection into nodes
@@ -294,8 +292,7 @@ define('pgadmin.node.mview', [
dataType: "json",
success: function(res) {
if (res.success == 1) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.success('View refreshed successfully');
+ alertify.success('View refreshed successfully');
}
else {
alertify.alert(
diff --git a/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js b/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js
index 2b9f052..e8fe62c 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js
+++ b/web/pgadmin/browser/server_groups/servers/databases/static/js/database.js
@@ -1,11 +1,9 @@
define('pgadmin.node.database', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
- 'underscore.string', 'pgadmin', 'pgadmin.browser.utils', 'alertify',
- 'sources/alerts/alertify_wrapper',
-
+ 'underscore.string', 'pgadmin', 'pgadmin.browser.utils', 'pgadmin.alertifyjs',
'pgadmin.browser.collection', 'pgadmin.browser.server.privilege',
- 'pgadmin.browser.server.variable',
-], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Alertify, AlertifyWrapper) {
+ 'pgadmin.browser.server.variable'
+], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Alertify) {
if (!pgBrowser.Nodes['coll-database']) {
var databases = pgBrowser.Nodes['coll-database'] =
@@ -192,9 +190,8 @@ define('pgadmin.node.database', [
type:'DELETE',
success: function(res) {
if (res.success == 1) {
- var prv_i = t.parent(i),
- alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.success(res.info);
+ var prv_i = t.parent(i);
+ Alertify.success(res.info);
t.removeIcon(i);
data.connected = false;
data.icon = 'icon-database-not-connected';
@@ -208,8 +205,7 @@ define('pgadmin.node.database', [
}
else {
try {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(res.errormsg);
+ Alertify.error(res.errormsg);
} catch (e) {}
t.unload(i);
}
@@ -218,8 +214,7 @@ define('pgadmin.node.database', [
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(err.errormsg);
+ Alertify.error(err.errormsg);
}
} catch (e) {}
t.unload(i);
@@ -516,8 +511,7 @@ define('pgadmin.node.database', [
tree.addIcon(item, {icon: data.icon});
}
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.success(res.info);
+ Alertify.success(res.info);
obj.trigger('connected', obj, item, data);
pgBrowser.Events.trigger(
'pgadmin:database:connected', item, data
diff --git a/web/pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js b/web/pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js
index f5ec62b..9bb6b37 100644
--- a/web/pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js
+++ b/web/pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js
@@ -1,10 +1,8 @@
define('pgadmin.node.pga_job', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
- 'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify',
- 'sources/alerts/alertify_wrapper',
-
+ 'underscore.string', 'pgadmin', 'pgadmin.browser', 'pgadmin.alertifyjs',
'pgadmin.node.pga_jobstep', 'pgadmin.node.pga_schedule'
-], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Alertify, AlertifyWrapper) {
+], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {
if (!pgBrowser.Nodes['coll-pga_job']) {
var pga_jobs = pgBrowser.Nodes['coll-pga_job'] =
@@ -181,18 +179,17 @@ define('pgadmin.node.pga_job', [
},
error: function(xhr, status, error) {
var error_msg = "Unable to run pgagent job.";
- var alertifyWrapper = new AlertifyWrapper();
if (xhr.readyState == 0) {
- alertifyWrapper.error(gettext('Not connected to the server or the connection to the server has been closed.'));
+ alertify.error(gettext('Not connected to the server or the connection to the server has been closed.'));
}
else {
if (_.isUndefined(xhr.responseText)) {
- alertifyWrapper.error(error_msg);
+ alertify.error(error_msg);
}
else {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- alertifyWrapper.error(err.errormsg);
+ alertify.error(err.errormsg);
}
}
}
diff --git a/web/pgadmin/browser/server_groups/servers/static/js/server.js b/web/pgadmin/browser/server_groups/servers/static/js/server.js
index ab753f6..4ee65e3 100644
--- a/web/pgadmin/browser/server_groups/servers/static/js/server.js
+++ b/web/pgadmin/browser/server_groups/servers/static/js/server.js
@@ -1,12 +1,12 @@
define('pgadmin.node.server', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
- 'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify',
+ 'underscore.string', 'pgadmin', 'pgadmin.browser',
'pgadmin.server.supported_servers',
'pgadmin.user_management.current_user',
- 'sources/alerts/alertify_wrapper', 'pgadmin.browser.server.privilege'
+ 'pgadmin.alertifyjs', 'pgadmin.browser.server.privilege'
], function(
- gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify,
- supported_servers, current_user, AlertifyWrapper
+ gettext, url_for, $, _, S, pgAdmin, pgBrowser,
+ supported_servers, current_user, alertify
) {
if (!pgBrowser.Nodes['server']) {
@@ -189,8 +189,7 @@ define('pgadmin.node.server', [
type:'DELETE',
success: function(res) {
if (res.success == 1) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.success(res.info);
+ alertify.success(res.info);
d = t.itemData(i);
t.removeIcon(i);
d.connected = false;
@@ -209,8 +208,7 @@ define('pgadmin.node.server', [
}
else {
try {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(res.errormsg);
+ alertify.error(res.errormsg);
} catch (e) {}
t.unload(i);
}
@@ -219,8 +217,7 @@ define('pgadmin.node.server', [
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(err.errormsg);
+ alertify.error(err.errormsg);
}
} catch (e) {}
t.unload(i);
@@ -288,20 +285,17 @@ define('pgadmin.node.server', [
method:'GET',
success: function(res) {
if (res.data.status) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.success(res.data.result);
+ alertify.success(res.data.result);
}
else {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(res.data.result);
+ alertify.error(res.data.result);
}
},
error: function(xhr, status, error) {
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(err.errormsg);
+ alertify.error(err.errormsg);
}
} catch (e) {}
t.unload(i);
@@ -336,15 +330,13 @@ define('pgadmin.node.server', [
method:'POST',
data:{ 'value': JSON.stringify(value) },
success: function(res) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.success(res.data.result, 10);
+ alertify.success(res.data.result, 10);
},
error: function(xhr, status, error) {
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(err.errormsg, 10);
+ alertify.error(err.errormsg, 10);
}
} catch (e) {}
t.unload(i);
@@ -352,8 +344,7 @@ define('pgadmin.node.server', [
});
} else {
evt.cancel = true;
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error( gettext('Please enter a valid name.'), 10);
+ alertify.error( gettext('Please enter a valid name.'), 10);
}
},
// We will execute this function when user clicks on the Cancel button
@@ -494,20 +485,18 @@ define('pgadmin.node.server', [
method:'POST',
data:{'data': JSON.stringify(args) },
success: function(res) {
- var alertifyWrapper = new AlertifyWrapper();
if (res.success) {
- alertifyWrapper.success(res.info);
+ alertify.success(res.info);
self.close();
} else {
- alertifyWrapper.error(res.errormsg);
+ alertify.error(res.errormsg);
}
},
error: function(xhr, status, error) {
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(err.errormsg);
+ alertify.error(err.errormsg);
}
} catch (e) {}
}
@@ -540,8 +529,7 @@ define('pgadmin.node.server', [
dataType: "json",
success: function(res) {
if (res.success == 1) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.success(res.info);
+ alertify.success(res.info);
t.itemData(i).wal_pause=res.data.wal_pause;
t.unload(i);
t.setInode(i);
@@ -557,8 +545,7 @@ define('pgadmin.node.server', [
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
msg = S(err.errormsg).value();
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(err.errormsg);
+ alertify.error(err.errormsg);
}
} catch (e) {}
t.unload(i);
@@ -584,8 +571,7 @@ define('pgadmin.node.server', [
dataType: "json",
success: function(res) {
if (res.success == 1) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.success(res.info);
+ alertify.success(res.info);
t.itemData(i).wal_pause=res.data.wal_pause;
t.unload(i);
t.setInode(i);
@@ -601,8 +587,7 @@ define('pgadmin.node.server', [
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
msg = S(err.errormsg).value();
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(err.errormsg);
+ alertify.error(err.errormsg);
}
} catch (e) {}
t.unload(i);
@@ -908,8 +893,7 @@ define('pgadmin.node.server', [
pgBrowser.serverInfo || {};
serverInfo[data._id] = _.extend({}, data);
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.success(res.info);
+ alertify.success(res.info);
obj.trigger('connected', obj, item, data);
// Generate the event that server is connected
diff --git a/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js b/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js
index 6181487..c8fb532 100644
--- a/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js
+++ b/web/pgadmin/browser/server_groups/servers/tablespaces/static/js/tablespace.js
@@ -1,11 +1,9 @@
define('pgadmin.node.tablespace', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
- 'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify',
- 'sources/alerts/alertify_wrapper',
-
+ 'underscore.string', 'pgadmin', 'pgadmin.browser', 'pgadmin.alertifyjs',
'pgadmin.browser.collection', 'pgadmin.browser.node.ui',
'pgadmin.browser.server.privilege'
-], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify, AlertifyWrapper) {
+], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {
if (!pgBrowser.Nodes['coll-tablespace']) {
var databases = pgBrowser.Nodes['coll-tablespace'] =
@@ -280,20 +278,17 @@ define('pgadmin.node.tablespace', [
data:{'data': JSON.stringify(args) },
success: function(res) {
if (res.success) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.success(res.info);
+ alertify.success(res.info);
self.close();
} else {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(res.errormsg);
+ alertify.error(res.errormsg);
}
},
error: function(xhr, status, error) {
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(err.errormsg);
+ alertify.error(err.errormsg);
}
} catch (e) {}
}
diff --git a/web/pgadmin/browser/static/js/browser.js b/web/pgadmin/browser/static/js/browser.js
index aa6442e..9c4f3b7 100644
--- a/web/pgadmin/browser/static/js/browser.js
+++ b/web/pgadmin/browser/static/js/browser.js
@@ -1,10 +1,10 @@
define(
'pgadmin.browser', [
'sources/gettext', 'sources/url_for', 'require', 'jquery', 'underscore', 'underscore.string',
- 'bootstrap', 'pgadmin', 'alertify', 'bundled_codemirror',
+ 'bootstrap', 'pgadmin', 'pgadmin.alertifyjs', 'bundled_codemirror',
'sources/check_node_visibility', 'pgadmin.browser.utils', 'wcdocker',
'jquery.contextmenu', 'jquery.aciplugin', 'jquery.acitree',
- 'pgadmin.alertifyjs', 'pgadmin.browser.messages',
+ 'pgadmin.browser.messages',
'pgadmin.browser.menu', 'pgadmin.browser.panel',
'pgadmin.browser.error', 'pgadmin.browser.frame',
'pgadmin.browser.node', 'pgadmin.browser.collection'
@@ -1846,8 +1846,7 @@ define(
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(err.errormsg);
+ Alertify.error(err.errormsg);
}
} catch (e) {}
fetchNodeInfo(_callback);
diff --git a/web/pgadmin/browser/static/js/node.js b/web/pgadmin/browser/static/js/node.js
index 9a36dc5..9db8533 100644
--- a/web/pgadmin/browser/static/js/node.js
+++ b/web/pgadmin/browser/static/js/node.js
@@ -1,8 +1,8 @@
define(
'pgadmin.browser.node', [
'sources/gettext', 'jquery', 'underscore', 'underscore.string', 'pgadmin',
- 'pgadmin.browser.menu', 'backbone', 'alertify', 'pgadmin.browser.datamodel',
- 'backform', 'pgadmin.browser.utils', 'pgadmin.backform', 'pgadmin.alertifyjs'
+ 'pgadmin.browser.menu', 'backbone', 'pgadmin.alertifyjs', 'pgadmin.browser.datamodel',
+ 'backform', 'pgadmin.browser.utils', 'pgadmin.backform'
], function(gettext, $, _, S, pgAdmin, Menu, Backbone, Alertify, pgBrowser, Backform) {
var wcDocker = window.wcDocker,
@@ -626,8 +626,7 @@ define(
if (!(_.isFunction(obj.canDropCascade) ?
obj.canDropCascade.apply(obj, [d, i]) : obj.canDropCascade)) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(
+ Alertify.error(
S('The %s "%s" cannot be dropped!')
.sprintf(obj.label, d.label).value(),
10
@@ -641,8 +640,7 @@ define(
if (!(_.isFunction(obj.canDrop) ?
obj.canDrop.apply(obj, [d, i]) : obj.canDrop)) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(
+ Alertify.error(
S('The %s "%s" cannot be dropped!')
.sprintf(obj.label, d.label).value(),
10
diff --git a/web/pgadmin/dashboard/static/js/dashboard.js b/web/pgadmin/dashboard/static/js/dashboard.js
index 1eee1da..86ebe38 100644
--- a/web/pgadmin/dashboard/static/js/dashboard.js
+++ b/web/pgadmin/dashboard/static/js/dashboard.js
@@ -1,11 +1,11 @@
define('pgadmin.dashboard', [
'sources/url_for', 'sources/gettext', 'require', 'jquery', 'underscore',
- 'pgadmin', 'backbone', 'backgrid', 'flotr2', 'alertify',
- 'sources/alerts/alertify_wrapper', 'backgrid.filter',
+ 'pgadmin', 'backbone', 'backgrid', 'flotr2',
+ 'pgadmin.alertifyjs', 'backgrid.filter',
'pgadmin.browser', 'bootstrap', 'wcdocker'
],
function(url_for, gettext, r, $, _, pgAdmin, Backbone, Backgrid, Flotr,
- alertify, AlertifyWrapper) {
+ alertify) {
var wcDocker = window.wcDocker,
pgBrowser = pgAdmin.Browser;
@@ -64,20 +64,18 @@ function(url_for, gettext, r, $, _, pgAdmin, Backbone, Backgrid, Flotr,
url: cancel_query_url + self.model.get('pid'),
type:'DELETE',
success: function(res) {
- var alertifyWrapper = new AlertifyWrapper();
if (res == gettext('Success')) {
- alertifyWrapper.success(gettext('Active query cancelled successfully.'));
+ alertify.success(gettext('Active query cancelled successfully.'));
refresh_grid();
} else {
- alertifyWrapper.error(gettext('An error occurred whilst cancelling the active query.'));
+ alertify.error(gettext('An error occurred whilst cancelling the active query.'));
}
},
error: function(xhr, status, error) {
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(err.errormsg);
+ alertify.error(err.errormsg);
}
} catch (e) {}
}
@@ -1073,7 +1071,6 @@ function(url_for, gettext, r, $, _, pgAdmin, Backbone, Backgrid, Flotr,
// If there is only one active session means it probably our main
// connection session
var active_sessions = m.collection.where({'state': 'active'}),
- alertifyWrapper = new AlertifyWrapper(),
pg_version = this.get('postgres_version') || null;
// With PG10, We have background process showing on dashboard
@@ -1082,20 +1079,20 @@ function(url_for, gettext, r, $, _, pgAdmin, Backbone, Backgrid, Flotr,
// Background processes do not have database field populated
if (pg_version && pg_version >= 100000 && !m.get('datname')) {
- alertifyWrapper.info(
+ alertify.info(
gettext('You cannot cancel background worker processes.')
);
return false;
// If it is the last active connection on maintenance db then error out
} else if (maintenance_database == m.get('datname') &&
m.get('state') == 'active' && active_sessions.length == 1) {
- alertifyWrapper.error(
+ alertify.error(
gettext('You are not allowed to cancel the main active session.')
);
return false;
} else if(m.get('state') == 'idle') {
// If this session is already idle then do nothing
- alertifyWrapper.info(
+ alertify.info(
gettext('The session is already in idle state.')
);
return false;
@@ -1107,8 +1104,7 @@ function(url_for, gettext, r, $, _, pgAdmin, Backbone, Backgrid, Flotr,
return true;
} else {
// Do not allow to cancel someone else session to non-super user
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(
+ alertify.error(
gettext('Superuser privileges are required to cancel another users query.')
);
return false;
diff --git a/web/pgadmin/misc/file_manager/static/js/file_manager.js b/web/pgadmin/misc/file_manager/static/js/file_manager.js
index 656c3b3..a88ed67 100644
--- a/web/pgadmin/misc/file_manager/static/js/file_manager.js
+++ b/web/pgadmin/misc/file_manager/static/js/file_manager.js
@@ -1,7 +1,7 @@
define('misc.file_manager', [
- 'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'alertify',
- 'sources/alerts/alertify_wrapper'
-], function(gettext, url_for, $, _, alertify, AlertifyWrapper) {
+ 'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
+ 'pgadmin.alertifyjs'
+], function(gettext, url_for, $, _, alertify) {
pgAdmin = pgAdmin || window.pgAdmin || {};
/*
@@ -595,14 +595,12 @@ define('misc.file_manager', [
permission = true;
} else {
$('.file_manager_ok').addClass('disabled');
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(data.Error);
+ alertify.error(data.Error);
}
},
error: function() {
$('.file_manager_ok').addClass('disabled');
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error( gettext('Error occurred while checking access permission.'));
+ alertify.error( gettext('Error occurred while checking access permission.'));
}
});
return permission;
diff --git a/web/pgadmin/misc/file_manager/static/js/utility.js b/web/pgadmin/misc/file_manager/static/js/utility.js
index 4a2754c..2bd73b9 100755
--- a/web/pgadmin/misc/file_manager/static/js/utility.js
+++ b/web/pgadmin/misc/file_manager/static/js/utility.js
@@ -11,10 +11,10 @@
import loading_icon from 'acitree/image/load-root.gif';
define(['jquery', 'underscore', 'underscore.string',
- 'sources/alerts/alertify_wrapper', 'sources/gettext',
+ 'pgadmin.alertifyjs', 'sources/gettext',
'sources/url_for', 'dropzone'
],
-function($, _, S, AlertifyWrapper, gettext, url_for, Dropzone) {
+function($, _, S, alertify, gettext, url_for, Dropzone) {
/*---------------------------------------------------------
Define functions used for various operations
@@ -311,11 +311,9 @@ var renameItem = function(data) {
// UnBind toolbar functions.
$('.fileinfo').find('button.rename, button.delete, button.download').unbind();
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.success(lg.successful_rename);
+ alertify.success(lg.successful_rename);
} else {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(result.Error);
+ alertify.error(result.Error);
}
finalName = result['New Name'];
@@ -356,16 +354,14 @@ var deleteItem = function(data) {
if (result.Code === 1) {
isDeleted = true;
if (isDeleted) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.success(lg.successful_delete);
+ alertify.success(lg.successful_delete);
var rootpath = result.Path.substring(0, result.Path.length-1); // removing the last slash
rootpath = rootpath.substr(0, rootpath.lastIndexOf('/') + 1);
getFolderInfo(rootpath);
}
} else {
isDeleted = false;
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(result.Error);
+ alertify.error(result.Error);
}
}
});
@@ -438,8 +434,7 @@ var getFileInfo = function(file) {
}
} else {
$('.file_manager_ok').addClass('disabled');
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(data.Error);
+ alertify.error(data.Error);
}
}
});
@@ -466,14 +461,12 @@ var checkPermission = function(path) {
permission = true;
} else {
$('.file_manager_ok').addClass('disabled');
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(data.Error);
+ alertify.error(data.Error);
}
},
error: function() {
$('.file_manager_ok').addClass('disabled');
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error( gettext('Error occurred while checking access permission.'));
+ alertify.error( gettext('Error occurred while checking access permission.'));
}
});
return permission;
@@ -549,8 +542,7 @@ var getFolderInfo = function(path, file_type) {
// hide activity indicator
$('.fileinfo').find('span.activity').hide();
if (data.Code === 0) {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(data.Error);
+ alertify.error(data.Error);
return;
}
// generate HTML for files/folder and render into container
@@ -1452,21 +1444,18 @@ pgAdmin.FileUtils = {
$this.find(".dz-upload").addClass("success");
}, 1000);
$this.find(".dz-upload").css('width', "100%").html("100%");
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.success(lg.upload_success);
+ alertify.success(lg.upload_success);
} else {
$this.find(".dz-upload").addClass("error");
$this.find(".dz-upload").css('width', "0%").html("0%");
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(data.Error);
+ alertify.error(data.Error);
}
getFolderInfo(path);
},
totaluploadprogress: function(progress) {},
complete: function(file) {
if (file.status == "error") {
- var alertifyWrapper = new AlertifyWrapper();
- alertifyWrapper.error(lg.upload_error);
+ alertify.error(lg.upload_error);
}
$('.upload_file .dz_cross_btn').removeAttr('disabled');
getFolderInfo(path);
diff --git a/web/pgadmin/static/js/alertify.pgadmin.defaults.js b/web/pgadmin/static/js/alertify.pgadmin.defaults.js
index d44a82f..33e5360 100644
--- a/web/pgadmin/static/js/alertify.pgadmin.defaults.js
+++ b/web/pgadmin/static/js/alertify.pgadmin.defaults.js
@@ -1,11 +1,10 @@
-require(
+define(
['sources/gettext', 'alertify', 'underscore.string'],
function(gettext, alertify, S) {
alertify.defaults.transition = "zoom";
alertify.defaults.theme.ok = "btn btn-primary";
alertify.defaults.theme.cancel = "btn btn-danger";
alertify.defaults.theme.input = "form-control";
-
alertify.pgIframeDialog || alertify.dialog('pgIframeDialog', function() {
var iframe;
return {
@@ -84,7 +83,6 @@ function(gettext, alertify, S) {
}
};
});
-
alertify.pgNotifier = function(type, xhr, promptmsg, onJSONResult) {
var msg = xhr.responseText,
contentType = xhr.getResponseHeader('Content-Type');
@@ -309,4 +307,56 @@ function(gettext, alertify, S) {
return false;
};
+ var alertifySuccess = alertify.success,
+ alertifyError = alertify.error;
+
+ /*
+ For adding the jasmine test cases, we needed to refer the original success,
+ and error functions, as orig_success and orig_error respectively.
+ */
+ _.extend(alertify, {
+ orig_success: alertifySuccess, orig_error: alertifyError
+ });
+
+ _.extend(alertify, {
+ success: function (message, timeout, callback) {
+ var alertMessage = '\
+ \
+
\
+
\
+ \
+
\
+
' + message + '
\
+
\
+
\
+
\
+
\
+ \
+
\
+
' + message + '
\
+
\
+
\
+
\
+
\
+ \
+
\
+
' + message + '
\
+
\
+
\
-
\
-
\
- \
-
\
-
' + message + '
\
-
\
-
\
-
\
-
\
- \
-
\
-
' + message + '
\
-
\
-
\
-
\
-
\
- \
-
\
-
' + message + '
\
-
\
-