mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-19 07:37:25 +01:00
various fixed
This commit is contained in:
@@ -1,4 +1,5 @@
|
|||||||
public/*
|
public/*
|
||||||
views/*
|
views/*
|
||||||
|
build
|
||||||
build/*
|
build/*
|
||||||
Gruntfile.js
|
Gruntfile.js
|
||||||
@@ -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;
|
|
||||||
@@ -165,4 +165,7 @@ a
|
|||||||
cursor: pointer
|
cursor: pointer
|
||||||
|
|
||||||
#modalMember p
|
#modalMember p
|
||||||
word-wrap: break-word;
|
word-wrap: break-word;
|
||||||
|
|
||||||
|
.btn
|
||||||
|
margin-right: 5px;
|
||||||
@@ -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);
|
||||||
|
|||||||
@@ -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{
|
||||||
|
|||||||
Reference in New Issue
Block a user