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

Revert "Refactoring & Feature: edit/delete controls of tasks (#11357)"

Browse Source 
This reverts commit 70b6501135.
This commit is contained in:
Sabe Jones
2019-09-26 17:32:26 -05:00
parent 2843484f44
commit ebfced4a2e
7 changed files with 24 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,7 @@
div(slot="dropdown-toggle", draggable=false)
.svg-icon.dropdown-icon(v-html="icons.menu")
div(slot="dropdown-content", draggable=false)
.dropdown-item.edit-task-item(ref="editTaskItem" v-if="showEdit")
.dropdown-item.edit-task-item(ref="editTaskItem")
span.dropdown-icon-item
span.svg-icon.inline.edit-icon(v-html="icons.edit")
span.text {{ $t('edit') }}
@@ -39,7 +39,7 @@
span.dropdown-icon-item
span.svg-icon.inline.push-to-bottom(v-html="icons.bottom")
span.text {{ $t('taskToBottom') }}
.dropdown-item(@click="destroy", v-if="showDelete")
.dropdown-item(@click="destroy", v-if="canDelete(task)")
span.dropdown-icon-item.delete-task-item
span.svg-icon.inline.delete(v-html="icons.delete")
span.text {{ $t('delete') }}
@@ -553,7 +553,6 @@ import axios from 'axios';
import scoreTask from 'common/script/ops/scoreTask';
import Vue from 'vue';
import * as Analytics from 'client/libs/analytics';
import isEmpty from 'lodash/isEmpty';
import positiveIcon from 'assets/svg/positive.svg';
import negativeIcon from 'assets/svg/negative.svg';
@@ -588,7 +587,7 @@ export default {
directives: {
markdown: markdownDirective,
},
props: ['task', 'isUser', 'group', 'challenge', 'dueDate'], // @TODO: maybe we should store the group on state?
props: ['task', 'isUser', 'group', 'dueDate', 'showOptions'], // @TODO: maybe we should store the group on state?
data () {
return {
random: uuid.v4(), // used to avoid conflicts between checkboxes ids
@@ -622,7 +621,6 @@ export default {
getTagsFor: 'tasks:getTagsFor',
getTaskClasses: 'tasks:getTaskClasses',
canDelete: 'tasks:canDelete',
canEdit: 'tasks:canEdit',
}),
hasChecklist () {
return this.task.checklist && this.task.checklist.length > 0;
@@ -702,27 +700,6 @@ export default {
return this.task.challenge.shortName ? this.task.challenge.shortName.toString() : '';
},
isChallangeTask () {
return !isEmpty(this.task.challenge);
},
isGroupTask () {
return !isEmpty(this.task.group) && (this.task.group.taskId || this.task.group.id);
},
taskCategory () {
let taskCategory = 'default';
if (this.isGroupTask) taskCategory = 'group';
else if (this.isChallangeTask) taskCategory = 'challenge';
return taskCategory;
},
showDelete () {
return this.canDelete(this.task, this.taskCategory, this.isUser, this.group, this.challenge);
},
showEdit () {
return this.canEdit(this.task, this.taskCategory, this.isUser, this.group, this.challenge);
},
showOptions () {
return this.showEdit || this.showDelete || this.isUser;
},
},
methods: {
...mapActions({
@@ -736,7 +713,7 @@ export default {
this.scoreChecklistItem({taskId: this.task._id, itemId: item.id});
},
edit (e, task) {
if (this.isRunningYesterdailies || !this.showEdit) return;
if (this.isRunningYesterdailies) return;
// Prevent clicking on a link from opening the edit modal
const target = e.target || e.srcElement;