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

Added broken task event

Browse Source
This commit is contained in:
thehollidayinn
2017-11-03 10:24:00 -06:00
parent 3cf7b2c96c
commit 2e5f5714e4
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
website/client/components/tasks/brokenTaskModal.vue
View File

@@ -1,6 +1,6 @@
<template lang='pug'> <template lang='pug'>
b-modal#broken-task-modal(title="Broken Challenge", size='sm', :hide-footer="true", v-if='brokenChallengeTask && brokenChallengeTask.challenge') b-modal#broken-task-modal(title="Broken Challenge", size='sm', :hide-footer="true")
.modal-body .modal-body(v-if='brokenChallengeTask && brokenChallengeTask.challenge')
div(v-if='brokenChallengeTask.challenge.broken === "TASK_DELETED" || brokenChallengeTask.challenge.broken === "CHALLENGE_TASK_NOT_FOUND"') div(v-if='brokenChallengeTask.challenge.broken === "TASK_DELETED" || brokenChallengeTask.challenge.broken === "CHALLENGE_TASK_NOT_FOUND"')
h2 {{ $t('brokenTask') }} h2 {{ $t('brokenTask') }}
div div
@@ -41,10 +41,19 @@ export default {
components: { components: {
bModal, bModal,
}, },
computed: { data () {
brokenChallengeTask () { return {
return this.$store.state.brokenChallengeTask; brokenChallengeTask: {},
}, };
},
created () {
this.$root.$on('handle-broken-task', (task) => {
this.brokenChallengeTask = Object.assign({}, task);
this.$root.$emit('show::modal', 'broken-task-modal');
});
},
removed () {
this.$root.$remove('handle-broken-task');
}, },
methods: { methods: {
...mapActions({ ...mapActions({

9
website/client/components/tasks/task.vue
View File

@@ -17,8 +17,8 @@
.d-flex.justify-content-between .d-flex.justify-content-between
h3.task-title(:class="{ 'has-notes': task.notes }", v-markdown="task.text") h3.task-title(:class="{ 'has-notes': task.notes }", v-markdown="task.text")
menu-dropdown.task-dropdown( menu-dropdown.task-dropdown(
v-if="isUser && !isRunningYesterdailies", v-if="isUser && !isRunningYesterdailies",
:right="task.type === 'reward'", :right="task.type === 'reward'",
ref="taskDropdown" ref="taskDropdown"
) )
div(slot="dropdown-toggle", draggable=false) div(slot="dropdown-toggle", draggable=false)
@@ -42,7 +42,7 @@
span.text {{ $t('delete') }} span.text {{ $t('delete') }}
.task-notes.small-text( .task-notes.small-text(
v-markdown="task.notes", v-markdown="task.notes",
:class="{'has-checklist': task.notes && hasChecklist}", :class="{'has-checklist': task.notes && hasChecklist}",
) )
.checklist(v-if="canViewchecklist") .checklist(v-if="canViewchecklist")
@@ -749,8 +749,7 @@ export default {
}, },
handleBrokenTask (task) { handleBrokenTask (task) {
if (this.$store.state.isRunningYesterdailies) return; if (this.$store.state.isRunningYesterdailies) return;
this.$store.state.brokenChallengeTask = task; this.$root.$emit('handle-broken-task', task);
this.$root.$emit('show::modal', 'broken-task-modal');
}, },
}, },
}; };