various fixed

This commit is contained in:
Matteo Pagliazzi
2013-09-11 20:08:53 +02:00
parent 1342a2cb89
commit 48c078a6ea
5 changed files with 9 additions and 11 deletions

View File

@@ -1,4 +1,5 @@
public/* public/*
views/* views/*
build
build/* build/*
Gruntfile.js Gruntfile.js

View File

@@ -41,13 +41,7 @@
height 500px height 500px
.buttonList li .buttonList li
margin: 5px; margin: 5px
.option-group .option-time .option-group .option-time
padding: 0px 5px padding: 0px 5px
.chat-btn
margin-right: 5px;
.personal-options .btn
margin-right: 5px;

View File

@@ -166,3 +166,6 @@ a
#modalMember p #modalMember p
word-wrap: break-word; word-wrap: break-word;
.btn
margin-right: 5px;

View File

@@ -142,7 +142,7 @@ habitrpg.controller("GroupsCtrl", ['$scope', '$rootScope', 'Groups', '$http', 'A
} }
$scope.reject = function(guild){ $scope.reject = function(guild){
var i = _.findIndex(User.user.invitations.guilds, {id:guild._id}); var i = _.findIndex(User.user.invitations.guilds, {id:guild.id});
if (~i){ if (~i){
User.user.invitations.guilds.splice(i, 1); User.user.invitations.guilds.splice(i, 1);
User.set('invitations.guilds', User.user.invitations.guilds); User.set('invitations.guilds', User.user.invitations.guilds);

View File

@@ -272,7 +272,7 @@ api.invite = function(req, res, next) {
} }
function sendInvite (){ function sendInvite (){
if(group.type = 'guild'){ if(group.type === 'guild'){
if(!invite.invitations.guilds) invite.invitations.guilds = [] //necessary if(!invite.invitations.guilds) invite.invitations.guilds = [] //necessary
invite.invitations.guilds.push({id: group._id, name: group.name}); invite.invitations.guilds.push({id: group._id, name: group.name});
}else{ }else{