krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

v3 client: more user friendly errors

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-05-17 19:22:35 +02:00
parent a757df9f5b
commit 2064db364f
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/script/public/config.js
View File

@@ -33,7 +33,13 @@ angular.module('habitrpg')
// never triggered because we're in responseError // never triggered because we're in responseError
$rootScope.$broadcast('responseText', response.data.message); $rootScope.$broadcast('responseText', response.data.message);
} else if (response.status < 500) { } else if (response.status < 500) {
$rootScope.$broadcast('responseError', response.data.message); if (response.status === 400 && response.data.errors && _.isArray(response.data.errors)) { // bad requests with more info
response.data.errors.forEach(function (err) {
$rootScope.$broadcast('responseError', err.message);
});
} else {
$rootScope.$broadcast('responseError', response.data.message);
}
// Need to reject the prompse so the error is handled correctly // Need to reject the prompse so the error is handled correctly
if (response.status === 401) { if (response.status === 401) {
return $q.reject(response); return $q.reject(response);
@@ -41,7 +47,7 @@ angular.module('habitrpg')
// Error // Error
} else { } else {
var error = window.env.t('requestError') + '<br><br>"' + var error = window.env.t('requestError') + '<br><br>"' +
window.env.t('error') + ' ' + (response.data.err || response.data || 'something went wrong') + window.env.t('error') + ' ' + (response.data.message || response.data.error || response.data || 'something went wrong') +
'" <br><br>' + window.env.t('seeConsole'); '" <br><br>' + window.env.t('seeConsole');
if (mobileApp) error = 'Error contacting the server. Please try again in a few minutes.'; if (mobileApp) error = 'Error contacting the server. Please try again in a few minutes.';
$rootScope.$broadcast('responseError500', error); $rootScope.$broadcast('responseError500', error);

4
website/client/js/controllers/authCtrl.js
View File

@@ -28,6 +28,10 @@ angular.module('habitrpg')
$scope.registrationInProgress = false; $scope.registrationInProgress = false;
if (status === 0) { if (status === 0) {
$window.alert(window.env.t('noReachServer')); $window.alert(window.env.t('noReachServer'));
} else if (status === 400 && data.errors && _.isArray(data.errors)) { // bad requests
data.errors.forEach(function (err) {
$window.alert(err.message);
});
} else if (!!data && !!data.error) { } else if (!!data && !!data.error) {
$window.alert(data.message); $window.alert(data.message);
} else { } else {