beenull/power-mailinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

suppress "Something went wrong, sorry." when the management daemon's api key has changed

Browse source
This commit is contained in:
Joshua Tauberer 2014-10-11 16:49:50 +00:00
parent 2f952a7915
commit 82851d6d2d
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
management/templates/index.html
View file

@ -277,7 +277,7 @@ function ajax(options) {
if (!old_error)
show_modal_error("Error", "Something went wrong, sorry.")
else
old_error(jqxhr.responseText);
old_error(jqxhr.responseText, jqxhr);
};
is_ajax_loading = true;
$.ajax(options);
@ -312,6 +312,11 @@ function api(url, method, data, callback, callback_error) {
return output;
}
function default_error(text, xhr) {
if (xhr.status != 403) // else handled below
show_modal_error("Error", "Something went wrong, sorry.")
}
ajax({
url: "/admin" + url,
method: method,
@ -325,7 +330,7 @@ function api(url, method, data, callback, callback_error) {
'Basic ' + base64encode(api_credentials[0] + ':' + api_credentials[1]));
},
success: callback,
error: callback_error,
error: callback_error || default_error,
statusCode: {
403: function(xhr) {
// Credentials are no longer valid. Try to login again.