Keith Holliday
1999e1098e
* test: test that admin users can update guilds * test: test admin removeMember privileges * fix: allow admins to edit guilds * fix: add edit guild options for admins * test: test that admin can't remove current leader * Add error msg for removing current leader * Taskwoods Quest Line (#8156) * feat(content): Gold Quest 2016-10 * chore(news): Bailey * chore(i18n): update locales * chore(sprites): compile * 3.49.0 * chore: update express * Fix for the ReDOS vulnerability habitica is currently affected by the high-severity [ReDOS vulnerability](https://snyk.io/vuln/npm:tough-cookie:20160722). Vulnerable module: `tough-cookie` Introduced through: ` request` This PR fixes the ReDOS vulnerability by upgrading ` request` to version 2.74.0 Check out the [Snyk test report](https://snyk.io/test/github/HabitRPG/habitica) to review other vulnerabilities that affect this repo. [Watch the repo](https://snyk.io/add) to * get alerts if newly disclosed vulnerabilities affect this repo in the future. * generate pull requests with the fixes you want, or let us do the work: when a newly disclosed vulnerability affects you, we'll submit a fix to you right away. Stay secure, The Snyk team * Documentation - coupon closes #8109 * fix(client): Allow member hp to be clickable fixes #8016 closes #8155 * chore(npm): shrinkwrap * test: test isAbleToEditGroup * Add isAbleToEditGroup to groupsCtrl * Remove unnecessary ternary * Fix linting * Move edit permission logic out to groupsCtrl * fix: change ternary to boolean * Fix linting * Fixed merge issues
199 lines
10 KiB
Plaintext
199 lines
10 KiB
Plaintext
include ./groups/group-subscription
|
||
include ./groups/group-plans-benefits
|
||
|
||
a.pull-right.gem-wallet(ng-if='group.type!="party"', popover-trigger='mouseenter', popover-title=env.t('guildBankPop1'), popover=env.t('guildBankPop2'), popover-placement='left')
|
||
// <span class="task-action-btn tile flush bright add-gems-btn">＋</span>
|
||
span.task-action-btn.tile.flush.neutral
|
||
.Pet_Currency_Gem2x.Gems
|
||
| {{group.balance * 4 | number:0 }}
|
||
=' ' + env.t('guildGems')
|
||
|
||
.container-fluid
|
||
ul.options-menu(ng-show='group.privacy === "private"')
|
||
li
|
||
a(ng-click="groupPanel = 'chat'")=env.t('groupHomeTitle')
|
||
li(ng-show='group.purchased.active')
|
||
a(ng-click="groupPanel = 'tasks'")=env.t('groupTasksTitle')
|
||
li(ng-show='group.purchased.active && userCanApprove(user._id, group)')
|
||
a(ng-click="groupPanel = 'approvals'")=env.t('approvalsTitle')
|
||
li
|
||
a(ng-click="groupPanel = 'subscription'", ng-show='group.leader._id === user._id && group.purchased.plan.customerId')=env.t('paymentDetails')
|
||
a(ng-click="groupPanel = 'subscription'", ng-show='group.leader._id === user._id && !group.purchased.plan.customerId')=env.t('upgradeTitle')
|
||
|
||
.tab-content
|
||
.tab-pane.active
|
||
|
||
.row(ng-show="groupPanel == 'chat'")
|
||
.col-md-4
|
||
|
||
// ------ Bosses -------
|
||
+boss(false, false)
|
||
|
||
// ------ Information -------
|
||
.panel.panel-default
|
||
.panel-heading(bindonce='group')
|
||
h3.panel-title
|
||
span {{group.name}}
|
||
span.group-leave-join(ng-if='group')
|
||
a.btn.btn-sm.btn-danger.pull-right(ng-if="isMemberOfGroup(User.user._id, group)", ng-hide='group._editing', ng-click='clickLeave(group, $event)')
|
||
span.glyphicon.glyphicon-ban-circle
|
||
=env.t('leave')
|
||
a.btn.btn-success.pull-right(ng-if='!isMemberOfGroup(User.user._id, group)', ng-click='join(group)')=env.t('join')
|
||
span(ng-if='isAbleToEditGroup(group)')
|
||
button.btn.btn-sm.btn-primary.pull-right(ng-click='cancelEdit(group)', ng-hide='!group._editing')=env.t('cancel')
|
||
button.btn.btn-sm.btn-primary.pull-right(ng-click='saveEdit(group)', ng-show='group._editing')=env.t('save')
|
||
button.btn.btn-sm.btn-default.pull-right(ng-click='editGroup(group)', ng-hide='group._editing')=env.t('editGroup')
|
||
|
||
.panel-body
|
||
form(ng-show='group._editing')
|
||
.form-group
|
||
label=env.t('groupName')
|
||
input.form-control(type='text', ng-model='groupCopy.name', placeholder=env.t('groupName'))
|
||
.form-group
|
||
label=env.t('description')
|
||
textarea.form-control(rows=6, ng-model='groupCopy.description')
|
||
include ../../shared/formatting-help
|
||
.form-group
|
||
label=env.t('logoUrl')
|
||
input.form-control(type='url', placeholder=env.t('logoUrl'), ng-model='groupCopy.logo')
|
||
.form-group
|
||
.checkbox
|
||
label
|
||
input(type='checkbox', ng-model='groupCopy.leaderOnly.challenges')
|
||
=env.t('leaderOnlyChallenges')
|
||
|
||
h4=env.t('assignLeader')
|
||
select#group-leader-selection(ng-model='groupCopy._newLeader', ng-options='member.profile.name for member in group.members')
|
||
|
||
div(ng-if='group.purchased.active')
|
||
h4=env.t('addManagers')
|
||
.form-group
|
||
select#group-leader-selection(ng-model='groupCopy._newManager')
|
||
option(ng-repeat='member in group.members', ng-if='member._id !== group.leader.id', ng-value='member._id') {{member.profile.name}}
|
||
button.btn.btn-primary.add-manager-button(ng-click='addManager()')=env.t('addManager')
|
||
ul
|
||
li(ng-repeat='(managerId, value) in groupCopy.managers')
|
||
| {{memberProfileName(managerId)}}
|
||
button.btn.btn-warning.remove-manager-button(ng-click='removeManager(managerId)')=env.t('removeManager')
|
||
|
||
div(ng-show='!group._editing')
|
||
img.img-rendering-auto.pull-right(ng-show='group.logo', ng-src='{{group.logo}}')
|
||
markdown(text='group.description')
|
||
br
|
||
p=env.t('groupLeader')
|
||
|:
|
||
a.badge.badge-info(ng-click='clickMember(group.leader._id, true)')
|
||
| {{group.leader.profile.name}}
|
||
|
||
.text-center(ng-if='group.type === "party"')
|
||
.row.row-margin: .col-sm-6.col-sm-offset-3
|
||
button.btn.btn-success.btn-block(
|
||
ng-if='!group.quest.key',
|
||
ng-click='clickStartQuest();'
|
||
)=env.t('startAQuest')
|
||
|
||
// ------ Members -------
|
||
.panel.panel-default
|
||
.panel-heading
|
||
h3.panel-title
|
||
=env.t('members')
|
||
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")
|
||
.panel-heading(ng-if='group.type=="party"')
|
||
p=env.t('partyMembersInfo', {memberCount: "{{group.memberCount}}", invitationCount:"{{group.invites.length}}", limitMembers:"{{PARTY_LIMIT_MEMBERS}}"})
|
||
|
||
.panel-body.modal-fixed-height
|
||
h4(ng-show='::group.memberCount === 1 && group.type === "party"')=env.t('partyEmpty')
|
||
table.table.table-striped(ng-show='::group.memberCount > 1 || group.type !== "party"' bindonce='group')
|
||
tr(ng-repeat='member in group.members track by member._id')
|
||
td.media
|
||
// allow leaders and administrators to ban members
|
||
.pull-left(ng-show='(isAbleToEditGroup(group) && member._id != user._id)')
|
||
a.media-object(ng-click='removeMember(group, member, true)')
|
||
span.glyphicon.glyphicon-ban-circle(tooltip=env.t('banTip'))
|
||
a.media-body
|
||
span(ng-click='clickMember(member._id, true)')
|
||
| {{member.profile.name}}
|
||
span(ng-click='clickMember(member._id, true)' ng-if='group.type === "party"')
|
||
| (#[strong {{member.stats.hp.toFixed(1)}}] #{env.t('hp')}) {{member.id === user.id ? ' ' + env.t('you') : ''}}
|
||
span(ng-if='group.leader._id === member.id')
|
||
| {{env.t('leaderMarker')}}
|
||
span(ng-show='isManager(member._id, group)')
|
||
| {{env.t('managerMarker')}}
|
||
.pull-right(ng-if='group.type === "party"')
|
||
span.text-success {{member.online ? '● ' + env.t('online') : ''}}
|
||
tr(ng-if='::group.memberCount > group.members.length')
|
||
td
|
||
span.badge {{group.memberCount - group.members.length}}
|
||
= ' ' + env.t('moreMembers')
|
||
h4(ng-show='group.invites.length > 0')=env.t('invited')
|
||
table.table.table-striped
|
||
tr(ng-repeat='invite in group.invites')
|
||
td.media
|
||
// allow leaders and administrators to ban members
|
||
.pull-left(ng-show='isAbleToEditGroup(group)')
|
||
a.media-object(ng-click='removeMember(group, invite, false)')
|
||
span.glyphicon.glyphicon-ban-circle(tooltip=env.t('banTip'))
|
||
a.media-body
|
||
span(ng-click='clickMember(invite._id, true)')
|
||
| {{invite.profile.name}}
|
||
|
||
.panel.panel-default(ng-if='::group.type=="party" && group.memberCount > 1')
|
||
.panel-heading
|
||
h3.panel-title=env.t('partyList')
|
||
.panel-body
|
||
.form-group
|
||
select.form-control#partyOrder(
|
||
ng-model='user.party.order',
|
||
ng-controller='ChatCtrl',
|
||
ng-options='k as v for (k , v) in partyOrderChoices',
|
||
ng-change='set({"party.order": user.party.order})'
|
||
)
|
||
|
|
||
select.form-control#partyOrderAscending(
|
||
ng-model='user.party.orderAscending',
|
||
ng-controller='ChatCtrl',
|
||
ng-options='k as v for (k , v) in partyOrderAscendingChoices',
|
||
ng-change='set({"party.orderAscending": user.party.orderAscending})'
|
||
)
|
||
|
||
include ./challenge-box
|
||
|
||
div(ng-if="group")
|
||
a.btn.btn-success(ng-if=':: !isMemberOfGroup(User.user._id, group)', ng-click='join(group)')=env.t('join')
|
||
|
||
.slight-vertical-padding
|
||
small.muted=env.t('groupID')
|
||
| : {{group._id}}
|
||
.slight-vertical-padding(ng-if='group.type === "party" && group.memberCount === 1')
|
||
small.muted=env.t('userId')
|
||
| : {{user._id}}
|
||
|
||
.col-md-8
|
||
div
|
||
textarea.form-control(ng-show='group._editing', rows=6, placeholder=env.t('leaderMsg'), ng-model='groupCopy.leaderMessage')
|
||
.slight-vertical-padding
|
||
table(ng-show='group.leaderMessage')
|
||
tr
|
||
td
|
||
.popover.static-popover.fade.right.in.wide-popover
|
||
.arrow
|
||
h3.popover-title {{group.leader.profile.name}}
|
||
.popover-content
|
||
markdown(text='group._editing ? groupCopy.leaderMessage : group.leaderMessage')
|
||
|
||
div(ng-controller='ChatCtrl')
|
||
.alert.alert-info.alert-sm(ng-if='group.memberCount > Shared.constants.LARGE_GROUP_COUNT_MESSAGE_CUTOFF')=env.t('largeGroupNote')
|
||
h3=env.t('chat')
|
||
include ./chat-box
|
||
|
||
+chatMessages()
|
||
h4(ng-if='group.chat.length < 1 && group.type === "party"')=env.t('partyChatEmpty')
|
||
h4(ng-if='group.chat.length < 1 && group.type === "guild"')=env.t('guildChatEmpty')
|
||
|
||
group-tasks(ng-show="groupPanel == 'tasks'")
|
||
|
||
group-approvals(ng-show="groupPanel == 'approvals'", ng-if="userCanApprove(user._id, group)", group="group")
|
||
|
||
+groupSubscription
|