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

fix: client: allow tags selection for user tasks

Browse Source
This commit is contained in:
Matteo Pagliazzi
2017-09-20 21:47:19 +02:00
parent 7812e14898
commit cd0222e208
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,7 +117,7 @@
span.custom-control-indicator span.custom-control-indicator
span.custom-control-description {{ $t('dayOfWeek') }} span.custom-control-description {{ $t('dayOfWeek') }}
.option(v-if="task.userId") .option(v-if="isUserTask")
label(v-once) {{ $t('tags') }} label(v-once) {{ $t('tags') }}
.category-wrap(@click="showTagsSelect = !showTagsSelect") .category-wrap(@click="showTagsSelect = !showTagsSelect")
span.category-select(v-if='task.tags && task.tags.length === 0') {{$t('none')}} span.category-select(v-if='task.tags && task.tags.length === 0') {{$t('none')}}
@@ -142,7 +142,7 @@
b-dropdown-item(v-for="frequency in ['daily', 'weekly', 'monthly']", :key="frequency", @click="task.frequency = frequency", :class="{active: task.frequency === frequency}") b-dropdown-item(v-for="frequency in ['daily', 'weekly', 'monthly']", :key="frequency", @click="task.frequency = frequency", :class="{active: task.frequency === frequency}")
| {{ $t(frequency) }} | {{ $t(frequency) }}
.option(v-if="task.type === 'daily' && task.userId") .option(v-if="task.type === 'daily' && isUserTask && purpose === 'edit'")
.form-group .form-group
label(v-once) {{ $t('restoreStreak') }} label(v-once) {{ $t('restoreStreak') }}
input(type="number", v-model="task.streak", min="0", required) input(type="number", v-model="task.streak", min="0", required)
@@ -485,6 +485,9 @@ export default {
controlClass () { controlClass () {
return this.getTaskClasses(this.task, this.purpose === 'edit' ? 'control' : 'controlCreate'); return this.getTaskClasses(this.task, this.purpose === 'edit' ? 'control' : 'controlCreate');
}, },
isUserTask () {
return !this.challengeId && !this.groupId;
},
repeatSuffix () { repeatSuffix () {
const task = this.task; const task = this.task;