pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup some inconsistent error dialog titles. Fixes #2098

pull/6/head
Murtuza Zabuawala 2017-12-01 15:38:59 +00:00 committed by Dave Page
parent 7e419d1bfe
commit bac9c77c4e
7 changed files with 42 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
web/pgadmin/tools/backup/static/js/backup.js
View File

@ -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;
}

1
web/pgadmin/tools/datagrid/static/js/datagrid.js
View File

@ -423,6 +423,7 @@ define('pgadmin.datagrid', [
},
error: function(e) {
alertify.alert(
gettext('Error'),
gettext('Query Tool Initialization Error')
);
}

4
web/pgadmin/tools/debugger/static/js/debugger.js
View File

@ -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) {}
}

9
web/pgadmin/tools/debugger/static/js/debugger_ui.js
View File

@ -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')
);
}
});

2
web/pgadmin/tools/debugger/static/js/direct.js
View File

@ -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) {}
}

10
web/pgadmin/tools/restore/static/js/restore.js
View File

@ -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;
}

9
web/pgadmin/tools/user_management/static/js/user_management.js
View File

@ -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);
}
});