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

Properly filter archived view and deleted cards

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2020-08-24 18:13:18 +02:00
parent b5862b482a
commit 7e183d6e99
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Db/CardMapper.php
View File

@@ -159,8 +159,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
public function findDeleted($boardId, $limit = null, $offset = null) { public function findDeleted($boardId, $limit = null, $offset = null) {
$qb = $this->queryCardsByBoard($boardId); $qb = $this->queryCardsByBoard($boardId);
$qb->andWhere($qb->expr()->neq('c.archived', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL))) $qb->andWhere($qb->expr()->neq('c.deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)))
->andWhere($qb->expr()->neq('c.deleted_at', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)))
->setMaxResults($limit) ->setMaxResults($limit)
->setFirstResult($offset) ->setFirstResult($offset)
->orderBy('order') ->orderBy('order')
@@ -186,6 +185,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
$qb->select('*') $qb->select('*')
->from('deck_cards') ->from('deck_cards')
->where($qb->expr()->eq('stack_id', $qb->createNamedParameter($stackId, IQueryBuilder::PARAM_INT))) ->where($qb->expr()->eq('stack_id', $qb->createNamedParameter($stackId, IQueryBuilder::PARAM_INT)))
->andWhere($qb->expr()->eq('archived', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)))
->setMaxResults($limit) ->setMaxResults($limit)
->setFirstResult($offset) ->setFirstResult($offset)
->orderBy('order') ->orderBy('order')

7
src/components/board/Stack.vue
View File

@@ -162,7 +162,12 @@ export default {
showArchived: state => state.showArchived, showArchived: state => state.showArchived,
}), }),
cardsByStack() { cardsByStack() {
return this.$store.getters.cardsByStack(this.stack.id) return this.$store.getters.cardsByStack(this.stack.id).filter((card) => {
if (this.showArchived) {
return card.archived
}
return !card.archived
})
}, },
dragHandleSelector() { dragHandleSelector() {
return this.canEdit ? null : '.no-drag' return this.canEdit ? null : '.no-drag'