YunoHost/yunohost-admin
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost-admin.git synced 2024-09-03 20:06:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

[enh] Use a more generic API error handler.

Browse source
This commit is contained in:
opi 2015-11-15 17:13:44 +01:00
parent d442f8fc82
commit ad3b0c230c
3 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/dist/js/script.min.js vendored
View file

File diff suppressed because one or more lines are too long

8
src/js/app.js
View file

@ -146,12 +146,6 @@ var app = Sammy('#main', function (sam) {
if (xhr.status == 200) { if (xhr.status == 200) {
// Fail with 200, WTF // Fail with 200, WTF
callback({}); callback({});
} else if (xhr.status == 404) {
// API's 404 are not JSON, we can't use raw responseJSON
// and responseText is a complete HTML document.
c.flash('fail', y18n.t('uri_not_found', [uri]));
// Redirect to previous page.
c.redirect(store.get('path-1'));
} else if (xhr.status == 401) { } else if (xhr.status == 401) {
if (uri === '/login') { if (uri === '/login') {
c.flash('fail', y18n.t('wrong_password')); c.flash('fail', y18n.t('wrong_password'));
@ -162,7 +156,7 @@ var app = Sammy('#main', function (sam) {
} else if (typeof xhr.responseJSON !== 'undefined') { } else if (typeof xhr.responseJSON !== 'undefined') {
c.flash('fail', xhr.responseJSON.error); c.flash('fail', xhr.responseJSON.error);
} else if (typeof xhr.statusText !== 'undefined' && uri !== '/postinstall') { } else if (typeof xhr.statusText !== 'undefined' && uri !== '/postinstall') {
c.flash('fail', xhr.statusText); c.flash('fail', y18n.t('api_not_responding', [xhr.status+' '+xhr.statusText]));
} else { } else {
if (uri === '/postinstall') { if (uri === '/postinstall') {
if (installing) { if (installing) {

1
src/locales/en.json
View file

@ -63,7 +63,6 @@
"unknown_argument" : "Unknown argument : %s", "unknown_argument" : "Unknown argument : %s",
"api_not_responding" : "API is not responding (Error : %s)", "api_not_responding" : "API is not responding (Error : %s)",
"error_retrieve_feed" : "Could not retrieve feed : %s", "error_retrieve_feed" : "Could not retrieve feed : %s",
"uri_not_found" : "Page not found : %s",
"confirm_delete" : "Are you sure you want to delete %s ?", "confirm_delete" : "Are you sure you want to delete %s ?",
"confirm_change_maindomain" : "Are you sure you want to change the main domain ?", "confirm_change_maindomain" : "Are you sure you want to change the main domain ?",