krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-15 13:47:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/HabitRPG/habitica/pull/12338 "Added the task type to the Delete alert window"

Browse Source 
by @Shuyinsama
Squashed commit of the following:

commit 0c05ff510e4bd0d7161c49245dd11e6abe882d96
Author: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date:   Sat Jun 27 19:41:58 2020 +0200

    fix lint

commit 2e1e1e4071d57fa2853a4a8f481c94bd5836037f
Merge: cbc9af4ef5 fc46d73b1d
Author: Matteo Pagliazzi <matteopagliazzi@gmail.com>
Date:   Sat Jun 27 19:39:58 2020 +0200

    Merge branch 'feature/Deleting-a-reward-asks-you-if-you-want-to-delete-the-task' of https://github.com/Shuyinsama/habitica into Shuyinsama-feature/Deleting-a-reward-asks-you-if-you-want-to-delete-the-task

commit fc46d73b1d
Author: Patrick van Zadel <Shuyinsama@users.noreply.github.com>
Date:   Sat Jun 27 18:54:08 2020 +0200

    Renamed keys and fixed a check in the modal

commit ec5b765f5c
Author: Patrick van Zadel <Shuyinsama@users.noreply.github.com>
Date:   Sat Jun 27 18:45:25 2020 +0200

    Renamed translation keys

commit f0837dc571
Author: Patrick van Zadel <patrickvanzadel@eleven.nl>
Date:   Tue Jun 23 23:06:59 2020 +0200

    Added the task type to the "Delete" alert window so it now asks if you want to delete the task of type
    Edited the "Delete this ..." button in the edit task modal to represent the task type
This commit is contained in:
Matteo Pagliazzi
2020-06-27 19:42:24 +02:00
parent cbc9af4ef5
commit a352a351bf
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
website/client/src/components/tasks/taskModal.vue
View File

@@ -707,7 +707,9 @@
class="svg-icon d-inline-b mt-1 mb-1"
v-html="icons.destroy"
></div>
<span class="delete-text mt-1 mb-1">{{ $t('deleteTask') }}</span>
<span class="delete-text mt-1 mb-1">
{{ $t('deleteTaskType', { type: $t(task.type) }) }}
</span>
</div>
</form>
</div>
@@ -1455,7 +1457,8 @@ export default {
this.$root.$emit('bv::hide::modal', 'task-modal');
},
destroy () {
if (!window.confirm(this.$t('sureDelete'))) return;
const type = this.$t(this.task.type);
if (!window.confirm(this.$t('sureDeleteType', { type }))) return;
this.destroyTask(this.task);
this.$emit('taskDestroyed', this.task);
this.$root.$emit('bv::hide::modal', 'task-modal');