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 various guilds issues

Browse Source
This commit is contained in:
Matteo Pagliazzi
2013-09-11 16:28:14 +02:00
parent 1bc5f0eb0c
commit 8e377d7343
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/js/controllers/groupsCtrl.js
View File

@@ -140,6 +140,11 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Groups', '$http', 'A
// if (~i) $scope.groups.guilds.splice(i, 1); // if (~i) $scope.groups.guilds.splice(i, 1);
alert('Left guild, refresh page to see changes') alert('Left guild, refresh page to see changes')
} }
$scope.reject = function(guild){
var i = _.findIndex(User.user.invitations.guilds, {id:guild._id});
if (~i) User.set('invitations.guilds', User.user.invitations.guilds.splice(i,1));
}
} }
]) ])

10
src/controllers/groups.js
View File

@@ -272,10 +272,16 @@ api.invite = function(req, res, next) {
} }
function sendInvite (){ function sendInvite (){
if(group.type = 'guild'){
if(!invite.invitations.guilds) invite.invitations.guilds = [] //necessary
invite.invitations.guilds.push({id: group._id, name: group.name});
}else{
//req.body.type in 'guild', 'party' //req.body.type in 'guild', 'party'
invite.invitations.party = {id:group._id, name: group.name} invite.invitations.party = {id: group._id, name: group.name}
}
invite.save(); invite.save();
Group.findById(group._id) group
.populate('members', partyFields).exec(function(err, saved){ .populate('members', partyFields).exec(function(err, saved){
res.json(saved); res.json(saved);
}); });

4
views/options/groups/index.jade
View File

@@ -17,7 +17,7 @@ ul.nav.nav-tabs
// {#with _user.invitations.party as :party} // {#with _user.invitations.party as :party}
h2 You're Invited To {{user.invitations.party.name}} h2 You're Invited To {{user.invitations.party.name}}
a.btn.btn-success(data-type='party', ng-click='join(user.invitations.party)') Accept a.btn.btn-success(data-type='party', ng-click='join(user.invitations.party)') Accept
a.btn.btn-danger(ng-click='reject(group)') Reject a.btn.btn-danger(ng-click='reject()') Reject
// {/} // {/}
div(ng-hide='user.invitations.party', ng-controller='PartyCtrl') div(ng-hide='user.invitations.party', ng-controller='PartyCtrl')
h2 Create A Party h2 Create A Party
@@ -40,7 +40,7 @@ ul.nav.nav-tabs
div(ng-repeat='invitation in user.invitations.guilds') div(ng-repeat='invitation in user.invitations.guilds')
h3 You're Invited To {{invitation.name}} h3 You're Invited To {{invitation.name}}
a.btn.btn-success(data-type='guild', ng-click='join(group)') Accept a.btn.btn-success(data-type='guild', ng-click='join(group)') Accept
a.btn.btn-danger(x-bind='click:rejectInvitation') Reject a.btn.btn-danger(ng-click='reject(invitation)') Reject
// Public Groups // Public Groups
.options-group.option-large.whatever-options .options-group.option-large.whatever-options
input.option-content(type='text',ng-model='guildSearch', placeholder='Search') input.option-content(type='text',ng-model='guildSearch', placeholder='Search')