krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Unlimit parties (#8653)"

Browse Source 
This reverts commit a4feae4dbb.
This commit is contained in:
SabreCat
2017-04-11 18:54:30 +00:00
parent 635c0cf3d1
commit a466d20935
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/api/v3/integration/groups/POST-groups_invite.test.js
View File

@@ -438,7 +438,7 @@ describe('Post /groups/:groupId/invite', () => {
})).to.be.an('array'); })).to.be.an('array');
}); });
xit('does not allow 30+ members in a party', async () => { it('does not allow 30+ members in a party', async () => {
let invitesToGenerate = []; let invitesToGenerate = [];
// Generate 30 users to invite (30 + leader = 31 members) // Generate 30 users to invite (30 + leader = 31 members)
for (let i = 0; i < PARTY_LIMIT_MEMBERS; i++) { for (let i = 0; i < PARTY_LIMIT_MEMBERS; i++) {

2
website/common/script/constants.js
View File

@@ -14,4 +14,4 @@ export const SUPPORTED_SOCIAL_NETWORKS = [
export const GUILDS_PER_PAGE = 30; // number of guilds to return per page when using pagination export const GUILDS_PER_PAGE = 30; // number of guilds to return per page when using pagination
export const PARTY_LIMIT_MEMBERS = 1000; export const PARTY_LIMIT_MEMBERS = 30;

2
website/views/options/social/group.jade
View File

@@ -88,7 +88,7 @@ a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter
=env.t('members') =env.t('members')
span(ng-if='group.type=="party" && (group.onlineUsers || group.onlineUsers == 0)')= ' (' + env.t('onlineCount', {count: "{{group.onlineUsers}}"}) + ')' span(ng-if='group.type=="party" && (group.onlineUsers || group.onlineUsers == 0)')= ' (' + env.t('onlineCount', {count: "{{group.onlineUsers}}"}) + ')'
button.pull-right.btn.btn-primary(ng-if='group.type=="party" ? (group.memberCount + group.invites.length < PARTY_LIMIT_MEMBERS) : true' ng-click="inviteOrStartParty(group)")=env.t("inviteFriends") button.pull-right.btn.btn-primary(ng-if='group.type=="party" ? (group.memberCount + group.invites.length < PARTY_LIMIT_MEMBERS) : true' ng-click="inviteOrStartParty(group)")=env.t("inviteFriends")
// .panel-heading(ng-if='group.type=="party"') .panel-heading(ng-if='group.type=="party"')
p=env.t('partyMembersInfo', {memberCount: "{{group.memberCount}}", invitationCount:"{{group.invites.length}}", limitMembers:"{{PARTY_LIMIT_MEMBERS}}"}) p=env.t('partyMembersInfo', {memberCount: "{{group.memberCount}}", invitationCount:"{{group.invites.length}}", limitMembers:"{{PARTY_LIMIT_MEMBERS}}"})
.panel-body.modal-fixed-height .panel-body.modal-fixed-height