ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

simplified logic avoid filtering for unassigned and assigned at the same time

Browse Source 
Signed-off-by: Jakob Röhrl <jakob.roehrl@web.de>
This commit is contained in:
Jakob Röhrl
2020-07-16 10:31:07 +02:00
parent de0145c3f5
commit 2b3a8cfaf6
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/Controls.vue
View File

@@ -260,6 +260,9 @@ export default {
} }
}, },
setFilter() { setFilter() {
if (this.filter.users.length > 0) {
this.filter.unassigned = false
}
this.$nextTick(() => this.$store.dispatch('setFilter', { ...this.filter })) this.$nextTick(() => this.$store.dispatch('setFilter', { ...this.filter }))
}, },
toggleNav() { toggleNav() {

9
src/store/card.js
View File

@@ -35,7 +35,6 @@ export default {
const { tags, users, due, unassigned } = rootState.filter const { tags, users, due, unassigned } = rootState.filter
let allTagsMatch = true let allTagsMatch = true
let allUsersMatch = true let allUsersMatch = true
let allUnassigned = true
if (tags.length > 0) { if (tags.length > 0) {
tags.forEach((tag) => { tags.forEach((tag) => {
@@ -59,15 +58,9 @@ export default {
} }
} }
if (unassigned) { if (unassigned && card.assignedUsers.length > 0) {
if (card.assignedUsers.length > 0) {
allUnassigned = false
}
if (!allUnassigned) {
return false return false
} }
}
if (due !== '') { if (due !== '') {
const datediffHour = ((new Date(card.duedate) - new Date()) / 3600 / 1000) const datediffHour = ((new Date(card.duedate) - new Date()) / 3600 / 1000)