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

Update alertify alerts to use the styling defined in the styleguide.

Browse Source
This commit is contained in:
Joao Pedro De Almeida Pereira
2017-06-30 10:21:05 +01:00
committed by Dave Page
parent ba3ab7b322
commit 2a30a86e7d
24 changed files with 253 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
web/pgadmin/browser/server_groups/servers/databases/casts/static/js/cast.js
View File

@@ -1,7 +1,10 @@
define('pgadmin.node.cast', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore', 'underscore.string', 'pgadmin',
'pgadmin.browser', 'alertify', 'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {
'pgadmin.browser', 'alertify',
'sources/alerts/alertify_wrapper',
'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify, AlertifyWrapper) {
// Extend the collection class for cast
if (!pgBrowser.Nodes['coll-cast']) {
var casts = pgAdmin.Browser.Nodes['coll-cast'] =
@@ -212,7 +215,8 @@ define('pgadmin.node.cast', [
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
alertify.error(err.errormsg);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.error(err.errormsg);
}
} catch (e) {}
}

7
web/pgadmin/browser/server_groups/servers/databases/schemas/synonyms/static/js/synonym.js
View File

@@ -1,8 +1,10 @@
define('pgadmin.node.synonym', [
'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) {
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify, AlertifyWrapper) {
if (!pgBrowser.Nodes['coll-synonym']) {
var databases = pgAdmin.Browser.Nodes['coll-synonym'] =
@@ -167,7 +169,8 @@ define('pgadmin.node.synonym', [
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
alertify.error(err.errormsg);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.error(err.errormsg);
}
} catch (e) {}
}

10
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/check_constraint/templates/check_constraint/js/check_constraint.js
View File

@@ -2,8 +2,10 @@
define('pgadmin.node.check_constraints', [
'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) {
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Alertify, AlertifyWrapper) {
// Check Constraint Node
if (!pgBrowser.Nodes['check_constraints']) {
@@ -63,7 +65,8 @@ define('pgadmin.node.check_constraints', [
type:'GET',
success: function(res) {
if (res.success == 1) {
Alertify.success(res.info);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.success(res.info);
t.removeIcon(i);
data.valid = true;
data.icon = 'icon-check_constraints';
@@ -76,7 +79,8 @@ define('pgadmin.node.check_constraints', [
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
Alertify.error(err.errormsg);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.error(err.errormsg);
}
} catch (e) {}
t.unload(i);

10
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/constraints/foreign_key/templates/foreign_key/js/foreign_key.js
View File

@@ -1,8 +1,10 @@
define('pgadmin.node.foreign_key', [
'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) {
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Alertify, AlertifyWrapper) {
var formatNode = function(opt) {
if (!opt.id) {
@@ -653,7 +655,8 @@ define('pgadmin.node.foreign_key', [
type:'GET',
success: function(res) {
if (res.success == 1) {
Alertify.success(res.info);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.success(res.info);
t.removeIcon(i);
data.valid = true;
data.icon = 'icon-foreign_key';
@@ -666,7 +669,8 @@ define('pgadmin.node.foreign_key', [
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
Alertify.error(err.errormsg);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.error(err.errormsg);
}
} catch (e) {}
t.unload(i);

21
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/static/js/table.js
View File

@@ -1,9 +1,10 @@
define('pgadmin.node.table', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify',
'sources/alerts/alertify_wrapper',
'pgadmin.browser.collection', 'pgadmin.node.column',
'pgadmin.node.constraints'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify, AlertifyWrapper) {
if (!pgBrowser.Nodes['coll-table']) {
var databases = pgBrowser.Nodes['coll-table'] =
@@ -122,7 +123,8 @@ define('pgadmin.node.table', [
dataType: "json",
success: function(res) {
if (res.success == 1) {
alertify.success(res.info);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.success(res.info);
t.unload(i);
t.setInode(i);
t.deselect(i);
@@ -135,7 +137,8 @@ define('pgadmin.node.table', [
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
alertify.error(err.errormsg);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.error(err.errormsg);
}
} catch (e) {}
t.unload(i);
@@ -174,7 +177,8 @@ define('pgadmin.node.table', [
dataType: "json",
success: function(res) {
if (res.success == 1) {
alertify.success(res.info);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.success(res.info);
t.removeIcon(i);
data.icon = 'icon-table';
t.addIcon(i, {icon: data.icon});
@@ -191,7 +195,8 @@ define('pgadmin.node.table', [
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
alertify.error(err.errormsg);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.error(err.errormsg);
}
} catch (e) {}
t.unload(i);
@@ -221,7 +226,8 @@ define('pgadmin.node.table', [
type:'DELETE',
success: function(res) {
if (res.success == 1) {
alertify.success(res.info);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.success(res.info);
t.removeIcon(i);
data.icon = 'icon-table';
t.addIcon(i, {icon: data.icon});
@@ -238,7 +244,8 @@ define('pgadmin.node.table', [
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
alertify.error(err.errormsg);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.error(err.errormsg);
}
} catch (e) {}
t.unload(i);

15
web/pgadmin/browser/server_groups/servers/databases/schemas/tables/triggers/templates/trigger/js/trigger.js
View File

@@ -1,8 +1,9 @@
define('pgadmin.node.trigger', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'backform', 'alertify',
'sources/alerts/alertify_wrapper',
'pgadmin.browser.collection'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify) {
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Backform, alertify, AlertifyWrapper) {
var CustomSwitchControl = Backform.CustomSwitchControl = Backform.SwitchControl.extend({
template: _.template([
@@ -109,7 +110,8 @@ define('pgadmin.node.trigger', [
dataType: "json",
success: function(res) {
if (res.success == 1) {
alertify.success(res.info);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.success(res.info);
t.removeIcon(i);
data.icon = 'icon-trigger';
t.addIcon(i, {icon: data.icon});
@@ -126,7 +128,8 @@ define('pgadmin.node.trigger', [
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
alertify.error(err.errormsg);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.error(err.errormsg);
}
} catch (e) {}
t.unload(i);
@@ -152,7 +155,8 @@ define('pgadmin.node.trigger', [
dataType: "json",
success: function(res) {
if (res.success == 1) {
alertify.success(res.info);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.success(res.info);
t.removeIcon(i);
data.icon = 'icon-trigger-bad';
t.addIcon(i, {icon: data.icon});
@@ -169,7 +173,8 @@ define('pgadmin.node.trigger', [
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
alertify.error(err.errormsg);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.error(err.errormsg);
}
} catch (e) {}
t.unload(i);

7
web/pgadmin/browser/server_groups/servers/databases/schemas/views/static/js/mview.js
View File

@@ -1,8 +1,10 @@
define('pgadmin.node.mview', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'alertify', 'pgadmin.browser', 'codemirror',
'sources/alerts/alertify_wrapper',
'pgadmin.browser.server.privilege'
], function(gettext, url_for, $, _, S, pgAdmin, alertify, pgBrowser, CodeMirror) {
], function(gettext, url_for, $, _, S, pgAdmin, alertify, pgBrowser, CodeMirror, AlertifyWrapper) {
/**
Create and add a view collection into nodes
@@ -292,7 +294,8 @@ define('pgadmin.node.mview', [
dataType: "json",
success: function(res) {
if (res.success == 1) {
alertify.success('View refreshed successfully');
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.success('View refreshed successfully');
}
else {
alertify.alert(

16
web/pgadmin/browser/server_groups/servers/databases/static/js/database.js
View File

@@ -1,9 +1,11 @@
define('pgadmin.node.database', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify',
'sources/alerts/alertify_wrapper',
'pgadmin.browser.collection', 'pgadmin.browser.server.privilege',
'pgadmin.browser.server.variable',
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Alertify) {
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Alertify, AlertifyWrapper) {
if (!pgBrowser.Nodes['coll-database']) {
var databases = pgBrowser.Nodes['coll-database'] =
@@ -191,7 +193,8 @@ define('pgadmin.node.database', [
success: function(res) {
if (res.success == 1) {
var prv_i = t.parent(i);
Alertify.success(res.info);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.success(res.info);
t.removeIcon(i);
data.connected = false;
data.icon = 'icon-database-not-connected';
@@ -205,7 +208,8 @@ define('pgadmin.node.database', [
}
else {
try {
Alertify.error(res.errormsg);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.error(res.errormsg);
} catch (e) {}
t.unload(i);
}
@@ -214,7 +218,8 @@ define('pgadmin.node.database', [
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
Alertify.error(err.errormsg);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.error(err.errormsg);
}
} catch (e) {}
t.unload(i);
@@ -511,7 +516,8 @@ define('pgadmin.node.database', [
tree.addIcon(item, {icon: data.icon});
}
Alertify.success(res.info);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.success(res.info);
obj.trigger('connected', obj, item, data);
pgBrowser.Events.trigger(
'pgadmin:database:connected', item, data

13
web/pgadmin/browser/server_groups/servers/pgagent/static/js/pga_job.js
View File

@@ -1,8 +1,10 @@
define('pgadmin.node.pga_job', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify',
'sources/alerts/alertify_wrapper',
'pgadmin.node.pga_jobstep', 'pgadmin.node.pga_schedule'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Alertify) {
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, Alertify, AlertifyWrapper) {
if (!pgBrowser.Nodes['coll-pga_job']) {
var pga_jobs = pgBrowser.Nodes['coll-pga_job'] =
@@ -178,18 +180,19 @@ define('pgadmin.node.pga_job', [
t.unload(i);
},
error: function(xhr, status, error) {
var error_msg = "Unable to run pgagent job.";
var error_msg = "Unable to run pgagent job.";
var alertifyWrapper = new AlertifyWrapper();
if (xhr.readyState == 0) {
alertify.error(gettext('Not connected to the server or the connection to the server has been closed.'));
alertifyWrapper.error(gettext('Not connected to the server or the connection to the server has been closed.'));
}
else {
if (_.isUndefined(xhr.responseText)) {
alertify.error(error_msg);
alertifyWrapper.error(error_msg);
}
else {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
alertify.error(err.errormsg);
alertifyWrapper.error(err.errormsg);
}
}
}

55
web/pgadmin/browser/server_groups/servers/static/js/server.js
View File

@@ -2,10 +2,11 @@ define('pgadmin.node.server', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify',
'pgadmin.server.supported_servers',
'pgadmin.user_management.current_user'
'pgadmin.user_management.current_user',
'sources/alerts/alertify_wrapper',
], function(
gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify,
supported_servers, current_user
supported_servers, current_user, AlertifyWrapper
) {
if (!pgBrowser.Nodes['server']) {
@@ -189,7 +190,8 @@ define('pgadmin.node.server', [
type:'DELETE',
success: function(res) {
if (res.success == 1) {
alertify.success(res.info);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.success(res.info);
d = t.itemData(i);
t.removeIcon(i);
d.connected = false;
@@ -208,7 +210,8 @@ define('pgadmin.node.server', [
}
else {
try {
alertify.error(res.errormsg);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.error(res.errormsg);
} catch (e) {}
t.unload(i);
}
@@ -217,7 +220,8 @@ define('pgadmin.node.server', [
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
alertify.error(err.errormsg);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.error(err.errormsg);
}
} catch (e) {}
t.unload(i);
@@ -285,17 +289,20 @@ define('pgadmin.node.server', [
method:'GET',
success: function(res) {
if (res.data.status) {
alertify.success(res.data.result);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.success(res.data.result);
}
else {
alertify.error(res.data.result);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.error(res.data.result);
}
},
error: function(xhr, status, error) {
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
alertify.error(err.errormsg);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.error(err.errormsg);
}
} catch (e) {}
t.unload(i);
@@ -330,13 +337,15 @@ define('pgadmin.node.server', [
method:'POST',
data:{ 'value': JSON.stringify(value) },
success: function(res) {
alertify.success(res.data.result, 10);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.success(res.data.result, 10);
},
error: function(xhr, status, error) {
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
alertify.error(err.errormsg, 10);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.error(err.errormsg, 10);
}
} catch (e) {}
t.unload(i);
@@ -344,7 +353,8 @@ define('pgadmin.node.server', [
});
} else {
evt.cancel = true;
alertify.error( gettext('Please enter a valid name.'), 10);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.error( gettext('Please enter a valid name.'), 10);
}
},
// We will execute this function when user clicks on the Cancel button
@@ -485,18 +495,20 @@ define('pgadmin.node.server', [
method:'POST',
data:{'data': JSON.stringify(args) },
success: function(res) {
var alertifyWrapper = new AlertifyWrapper();
if (res.success) {
alertify.success(res.info);
alertifyWrapper.success(res.info);
self.close();
} else {
alertify.error(res.errormsg);
alertifyWrapper.error(res.errormsg);
}
},
error: function(xhr, status, error) {
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
alertify.error(err.errormsg);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.error(err.errormsg);
}
} catch (e) {}
}
@@ -529,7 +541,8 @@ define('pgadmin.node.server', [
dataType: "json",
success: function(res) {
if (res.success == 1) {
alertify.success(res.info);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.success(res.info);
t.itemData(i).wal_pause=res.data.wal_pause;
t.unload(i);
t.setInode(i);
@@ -545,7 +558,8 @@ define('pgadmin.node.server', [
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
msg = S(err.errormsg).value();
alertify.error(err.errormsg);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.error(err.errormsg);
}
} catch (e) {}
t.unload(i);
@@ -571,7 +585,8 @@ define('pgadmin.node.server', [
dataType: "json",
success: function(res) {
if (res.success == 1) {
alertify.success(res.info);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.success(res.info);
t.itemData(i).wal_pause=res.data.wal_pause;
t.unload(i);
t.setInode(i);
@@ -587,7 +602,8 @@ define('pgadmin.node.server', [
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
msg = S(err.errormsg).value();
alertify.error(err.errormsg);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.error(err.errormsg);
}
} catch (e) {}
t.unload(i);
@@ -888,7 +904,8 @@ define('pgadmin.node.server', [
pgBrowser.serverInfo || {};
serverInfo[data._id] = _.extend({}, data);
alertify.success(res.info);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.success(res.info);
obj.trigger('connected', obj, item, data);
// Generate the event that server is connected

13
web/pgadmin/browser/server_groups/servers/tablespaces/templates/tablespaces/js/tablespaces.js
View File

@@ -1,9 +1,11 @@
define('pgadmin.node.tablespace', [
'sources/gettext', 'sources/url_for', 'jquery', 'underscore',
'underscore.string', 'pgadmin', 'pgadmin.browser', 'alertify',
'sources/alerts/alertify_wrapper',
'pgadmin.browser.collection', 'pgadmin.browser.node.ui',
'pgadmin.browser.server.privilege'
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify) {
], function(gettext, url_for, $, _, S, pgAdmin, pgBrowser, alertify, AlertifyWrapper) {
if (!pgBrowser.Nodes['coll-tablespace']) {
var databases = pgBrowser.Nodes['coll-tablespace'] =
@@ -278,17 +280,20 @@ define('pgadmin.node.tablespace', [
data:{'data': JSON.stringify(args) },
success: function(res) {
if (res.success) {
alertify.success(res.info);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.success(res.info);
self.close();
} else {
alertify.error(res.errormsg);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.error(res.errormsg);
}
},
error: function(xhr, status, error) {
try {
var err = $.parseJSON(xhr.responseText);
if (err.success == 0) {
alertify.error(err.errormsg);
var alertifyWrapper = new AlertifyWrapper();
alertifyWrapper.error(err.errormsg);
}
} catch (e) {}
}