diff --git a/package-lock.json b/package-lock.json index dafb1abd41..73c460c9b9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "habitica", - "version": "4.6.0", + "version": "4.6.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index a36229e8c1..293e16dae5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "habitica", "description": "A habit tracker app which treats your goals like a Role Playing Game.", - "version": "4.6.0", + "version": "4.6.1", "main": "./website/server/index.js", "dependencies": { "@slack/client": "^3.8.1", diff --git a/website/client/components/group-plans/index.vue b/website/client/components/group-plans/index.vue index f30dead42b..7674d4b6f9 100644 --- a/website/client/components/group-plans/index.vue +++ b/website/client/components/group-plans/index.vue @@ -32,13 +32,20 @@ export default { user: 'user.data', groupPlans: 'groupPlans', }), - isLeader () { + currentGroup () { let groupFound = this.groupPlans.find(group => { return group._id === this.groupId; }); - if (!groupFound) return false; - return groupFound.leader === this.user._id; + return groupFound; + }, + isLeader () { + if (!this.currentGroup) return false; + return this.currentGroup.leader === this.user._id; + }, + isManager () { + if (!this.currentGroup) return false; + return Boolean(this.currentGroup.managers[this.user._id]); }, }, }; diff --git a/website/client/components/groups/membersModal.vue b/website/client/components/groups/membersModal.vue index 3630a69e10..769208d56d 100644 --- a/website/client/components/groups/membersModal.vue +++ b/website/client/components/groups/membersModal.vue @@ -40,11 +40,11 @@ div span.dropdown-icon-item .svg-icon.inline(v-html="icons.starIcon") span.text {{$t('promoteToLeader')}} - b-dropdown-item(@click='addManager(member)', v-if='isLeader && groupIsSubscribed') + b-dropdown-item(@click='addManager(member._id)', v-if='isLeader && groupIsSubscribed') span.dropdown-icon-item .svg-icon.inline(v-html="icons.starIcon") span.text {{$t('addManager')}} - b-dropdown-item(@click='removeManager(member)', v-if='isLeader && groupIsSubscribed') + b-dropdown-item(@click='removeManager(member._id)', v-if='isLeader && groupIsSubscribed') span.dropdown-icon-item .svg-icon.inline(v-html="icons.removeIcon") span.text {{$t('removeManager2')}} diff --git a/website/client/components/settings/promoCode.vue b/website/client/components/settings/promoCode.vue index db25538a84..d6184bf76c 100644 --- a/website/client/components/settings/promoCode.vue +++ b/website/client/components/settings/promoCode.vue @@ -23,8 +23,10 @@