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

fix #1803, when getting a drop do not return whole user, @lefnire it is ok to change api return data or we need to annouce it before so that third parties can update their code?

Browse Source
This commit is contained in:
Matteo Pagliazzi
2013-11-20 21:36:18 +01:00
parent bca346e616
commit 1a388fa994
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/js/controllers/notificationCtrl.js
View File

@@ -39,6 +39,7 @@ habitrpg.controller('NotificationCtrl',
}); });
$rootScope.$watch('user.achievements.ultimateGear', function(after, before){ $rootScope.$watch('user.achievements.ultimateGear', function(after, before){
console.log(after, before)
if (after === before || after !== true) return; if (after === before || after !== true) return;
$rootScope.modals.achievements.ultimateGear = true; $rootScope.modals.achievements.ultimateGear = true;
}); });

5
public/js/services/userServices.js
View File

@@ -65,13 +65,14 @@ angular.module('userServices', []).
// the user has been modified from another application, sync up // the user has been modified from another application, sync up
if(data.wasModified) { if(data.wasModified) {
delete data.wasModified; delete data.wasModified;
_.extend(user, data);
$rootScope.$emit('userUpdated', user); $rootScope.$emit('userUpdated', user);
} }
// Update user
_.extend(user, data);
// Emit event when user is synced // Emit event when user is synced
$rootScope.$emit('userSynced'); $rootScope.$emit('userSynced');
user._v = data._v;
} }
sent.length = 0; sent.length = 0;
settings.fetching = false; settings.fetching = false;

7
src/controllers/user.js
View File

@@ -566,10 +566,9 @@ api.batchUpdate = function(req, res, next) {
if (err) return res.json(500, {err: err}); if (err) return res.json(500, {err: err});
var response = user.toJSON(); var response = user.toJSON();
response.wasModified = res.locals.wasModified; response.wasModified = res.locals.wasModified;
if (response._tmp && response._tmp.drop) response.wasModified = true; if (response._tmp && response._tmp.drop){
res.json(200, {_tmp: {drop: response._tmp.drop}, _v: response._v});
// Send the response to the server }else if(response.wasModified){
if(response.wasModified){
res.json(200, response); res.json(200, response);
}else{ }else{
res.json(200, {_v: response._v}); res.json(200, {_v: response._v});