From 4230a84322e0b9242225c5dea850b5176c55486f Mon Sep 17 00:00:00 2001 From: negue Date: Wed, 20 Sep 2017 01:09:53 +0200 Subject: [PATCH] fix start quest modal from items - disable invite quest button if a quest is already active --- website/client/components/groups/startQuestModal.vue | 8 +++++--- website/client/components/inventory/items/index.vue | 2 +- website/common/script/libs/shops-seasonal.config.js | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/website/client/components/groups/startQuestModal.vue b/website/client/components/groups/startQuestModal.vue index b28633471af..44c9d03dc24 100644 --- a/website/client/components/groups/startQuestModal.vue +++ b/website/client/components/groups/startQuestModal.vue @@ -12,7 +12,7 @@ div(v-if='questData') questDialogContent(:item="questData") div.text-center - button.btn.btn-primary(@click='questInit()') {{$t('inviteToPartyOrQuest')}} + button.btn.btn-primary(@click='questInit()', :disabled="Boolean(group.quest)") {{$t('inviteToPartyOrQuest')}} div.text-center p {{$t('inviteInformation')}} .side-panel(v-if='questData') @@ -165,12 +165,14 @@ export default { partyID: this.group._id, partySize: this.group.memberCount, }); - const key = this.selectedQuest; const response = await this.$store.dispatch('guilds:inviteToQuest', {groupId: this.group._id, key}); const quest = response.data.data; - this.$store.state.party.data.quest = quest; + if (this.$store.state.party) { + this.$store.state.party.data.quest = quest; + } + this.$root.$emit('hide::modal', 'start-quest-modal'); }, }, diff --git a/website/client/components/inventory/items/index.vue b/website/client/components/inventory/items/index.vue index fbb25ae0451..8eaee6b8515 100644 --- a/website/client/components/inventory/items/index.vue +++ b/website/client/components/inventory/items/index.vue @@ -147,7 +147,7 @@ ) startQuestModal( - group="user.party" + :group="user.party" ) diff --git a/website/common/script/libs/shops-seasonal.config.js b/website/common/script/libs/shops-seasonal.config.js index 62e7077e29e..4e5e9f32ac8 100644 --- a/website/common/script/libs/shops-seasonal.config.js +++ b/website/common/script/libs/shops-seasonal.config.js @@ -1,4 +1,4 @@ -import {EVENTS, SEASONAL_SETS} from '../content/constants'; +import { SEASONAL_SETS} from '../content/constants'; module.exports = { // opened: false,