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

Ported groups service to user new api v3 and ported dependent controllers (#7108)

Browse Source 
* Ported groups service to user new api v3 and ported dependent controllers

* Remove  and extra remove inviation code. Fixed group service caching and update group service tests

* Fixed test logic and added party cache support

* Added promise rejections and updated http interceptor
This commit is contained in:
Keith Holliday
2016-04-25 16:11:23 -05:00
committed by Matteo Pagliazzi
parent f2d5c921ed
commit ea490c9a1f
15 changed files with 565 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,7 @@
'use strict';
angular.module('habitrpg').config(['$httpProvider', function($httpProvider){
angular.module('habitrpg')
.config(['$httpProvider', function($httpProvider){
$httpProvider.interceptors.push(['$q', '$rootScope', function($q, $rootScope){
return {
response: function(response) {
@@ -28,15 +30,15 @@ angular.module('habitrpg').config(['$httpProvider', function($httpProvider){
// 400 range?
} else if (response.status < 500) {
$rootScope.$broadcast('responseText', response.data.err || response.data);
$rootScope.$broadcast('responseText', response.data.err || response.data.message);
// Need to reject the prompse so the error is handled correctly
if (response.status === 401)
if (response.status === 401) {
return $q.reject(response);
}
// Error
} else {
var error = window.env.t('requestError') + '<br><br>"' +
window.env.t('error') + ' ' + (response.data.err || response.data || 'something went wrong') +
var error = window.env.t('requestError') + '<br><br>"' +
window.env.t('error') + ' ' + (response.data.err || response.data || 'something went wrong') +
'" <br><br>' + window.env.t('seeConsole');
if (mobileApp) error = 'Error contacting the server. Please try again in a few minutes.';
$rootScope.$broadcast('responseError', error);
@@ -47,4 +49,4 @@ angular.module('habitrpg').config(['$httpProvider', function($httpProvider){
}
};
}]);
}]);
}]);

8
common/script/public/userServices.js
View File

@@ -102,14 +102,14 @@ angular.module('habitrpg')
op(req,function(err,response) {
for(var updatedItem in req.body) {
var itemUpdateResponse = userNotifications[updatedItem];
if(itemUpdateResponse) Notification.text(itemUpdateResponse);
if(itemUpdateResponse) Notification.text(itemUpdateResponse.data.message);
}
if (err) {
var message = err.code ? err.message : err;
if (MOBILE_APP) Notification.push({type:'text',text:message});
var message = err.code ? err.data.message : err;
if (MOBILE_APP) Notification.push({type:'text', text: message});
else Notification.text(message);
// In the case of 200s, they're friendly alert messages like "Your pet has hatched!" - still send the op
if ((err.code && err.code >= 400) || !err.code) return;
if ((err.code && err.code >= 400) || !err.code) return;
}
userServices.log({op:k, params: req.params, query:req.query, body:req.body});
});