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

Fixes #4816

Browse Source
This commit is contained in:
Blade Barringer
2015-06-14 21:17:18 -05:00
parent bb73253e8e
commit 00c50f1212
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
website/public/js/controllers/groupsCtrl.js
View File

@@ -391,8 +391,13 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
}; };
$scope.sync = function(group){ $scope.sync = function(group){
if(group.type == 'party') {
group.$syncParty(); // Syncs the whole party, not just 15 members
} else {
group.$get(); group.$get();
//When the user clicks fetch recent messages we need to update that the user has seen the new messages }
// When the user clicks fetch recent messages we need to update
// that the user has seen the new messages
Chat.seenMessage(group._id); Chat.seenMessage(group._id);
} }
@@ -516,7 +521,7 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Shared', 'Groups', '
$scope.newGroup = new Groups.Group({type:'party'}); $scope.newGroup = new Groups.Group({type:'party'});
if ($state.is('options.social.party')) { if ($state.is('options.social.party')) {
$scope.group.$get(); // Sync party automatically when navigating to party page $scope.group.$syncParty(); // Sync party automatically when navigating to party page
} }
Chat.seenMessage($scope.group._id); Chat.seenMessage($scope.group._id);

1
website/public/js/services/groupServices.js
View File

@@ -23,6 +23,7 @@ function(ApiUrl, $resource, $q, $http, User, Challenges) {
} }
}, },
syncParty: {method: "GET", url: '/api/v2/groups/party'},
join: {method: "POST", url: ApiUrl.get() + '/api/v2/groups/:gid/join'}, join: {method: "POST", url: ApiUrl.get() + '/api/v2/groups/:gid/join'},
leave: {method: "POST", url: ApiUrl.get() + '/api/v2/groups/:gid/leave'}, leave: {method: "POST", url: ApiUrl.get() + '/api/v2/groups/:gid/leave'},
invite: {method: "POST", url: ApiUrl.get() + '/api/v2/groups/:gid/invite'}, invite: {method: "POST", url: ApiUrl.get() + '/api/v2/groups/:gid/invite'},