diff --git a/test/spec/services/groupServicesSpec.js b/test/spec/services/groupServicesSpec.js index 71e6b7d08e..5b4a88c996 100644 --- a/test/spec/services/groupServicesSpec.js +++ b/test/spec/services/groupServicesSpec.js @@ -37,6 +37,8 @@ describe('groupServices', function() { var groupResponse = {data: {_id: groupId}}; $httpBackend.expectGET(groupApiUrlPrefix + '/party').respond(groupResponse); $httpBackend.expectGET('/api/v3/groups/' + groupId + '/members?includeAllPublicFields=true').respond({}); + $httpBackend.expectGET('/api/v3/groups/' + groupId + '/invites').respond({}); + $httpBackend.expectGET('/api/v3/challenges/groups/' + groupId).respond({}); groups.Group.syncParty(); $httpBackend.flush(); }); @@ -81,6 +83,8 @@ describe('groupServices', function() { var groupResponse = {data: {_id: groupId}}; $httpBackend.expectGET(groupApiUrlPrefix + '/party').respond(groupResponse); $httpBackend.expectGET('/api/v3/groups/' + groupId + '/members?includeAllPublicFields=true').respond({}); + $httpBackend.expectGET('/api/v3/groups/' + groupId + '/invites').respond({}); + $httpBackend.expectGET('/api/v3/challenges/groups/' + groupId).respond({}); groups.party(); $httpBackend.flush(); }); diff --git a/test/spec/services/questServicesSpec.js b/test/spec/services/questServicesSpec.js index b4741b601c..e71dc6f3ef 100644 --- a/test/spec/services/questServicesSpec.js +++ b/test/spec/services/questServicesSpec.js @@ -349,6 +349,8 @@ describe('Quests Service', function() { fakeBackend.when('GET', 'partials/main.html').respond({}); fakeBackend.when('GET', '/api/v3/groups/party').respond(partyResponse); fakeBackend.when('GET', '/api/v3/groups/party-id/members?includeAllPublicFields=true').respond({}); + fakeBackend.when('GET', '/api/v3/groups/party-id/invites').respond({}); + fakeBackend.when('GET', '/api/v3/challenges/groups/party-id').respond({}); fakeBackend.when('POST', '/api/v3/groups/party-id/quests/invite/' + key).respond({quest: { key: 'whale' } }); fakeBackend.flush(); })); diff --git a/website/client/js/controllers/tavernCtrl.js b/website/client/js/controllers/tavernCtrl.js index cb02d07cef..77056e07a2 100644 --- a/website/client/js/controllers/tavernCtrl.js +++ b/website/client/js/controllers/tavernCtrl.js @@ -1,10 +1,14 @@ 'use strict'; -habitrpg.controller("TavernCtrl", ['$scope', 'Groups', 'User', - function($scope, Groups, User) { +habitrpg.controller("TavernCtrl", ['$scope', 'Groups', 'User', 'Challenges', + function($scope, Groups, User, Challenges) { Groups.tavern() .then(function (tavern) { $scope.group = tavern; + Challenges.getGroupChallenges($scope.group._id) + .then(function (response) { + $scope.group.challenges = response.data.data; + }); }) $scope.toggleUserTier = function($event) { diff --git a/website/client/js/services/groupServices.js b/website/client/js/services/groupServices.js index c8b537144e..772c5e3814 100644 --- a/website/client/js/services/groupServices.js +++ b/website/client/js/services/groupServices.js @@ -121,8 +121,16 @@ angular.module('habitrpg') Members.getGroupMembers(data.party._id, true) .then(function (response) { data.party.members = response.data.data; - _cachedPartyPromise.resolve(data.party); }); + Members.getGroupInvites(data.party._id) + .then(function (response) { + data.party.invites = response.data.data; + }); + Challenges.getGroupChallenges(data.party._id) + .then(function (response) { + data.party.challenges = response.data.data; + }); + _cachedPartyPromise.resolve(data.party); }, function (response) { data.party = { type: 'party' }; _cachedPartyPromise.reject(data.party);