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

Fix rebaseing issues

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2020-09-01 15:43:37 +02:00
parent c2a4f946b4
commit 3f7966a6d4
1 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/Db/CardMapper.php
View File

@@ -83,8 +83,8 @@ class CardMapper extends QBMapper implements IPermissionMapper {
// make sure we only reset the notification flag if the duedate changes // make sure we only reset the notification flag if the duedate changes
if (in_array('duedate', $entity->getUpdatedFields(), true)) { if (in_array('duedate', $entity->getUpdatedFields(), true)) {
/** @var Card $existing */
try { try {
/** @var Card $existing */
$existing = $this->find($entity->getId()); $existing = $this->find($entity->getId());
if ($existing && $entity->getDuedate() !== $existing->getDuedate()) { if ($existing && $entity->getDuedate() !== $existing->getDuedate()) {
$entity->setNotified(false); $entity->setNotified(false);
@@ -131,9 +131,10 @@ class CardMapper extends QBMapper implements IPermissionMapper {
->andWhere($qb->expr()->eq('archived', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL))) ->andWhere($qb->expr()->eq('archived', $qb->createNamedParameter(false, IQueryBuilder::PARAM_BOOL)))
->andWhere($qb->expr()->eq('deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT))) ->andWhere($qb->expr()->eq('deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)))
->andWhere($qb->expr()->gt('last_modified', $qb->createNamedParameter($since, IQueryBuilder::PARAM_INT))) ->andWhere($qb->expr()->gt('last_modified', $qb->createNamedParameter($since, IQueryBuilder::PARAM_INT)))
->orderBy('order', 'id')
->setMaxResults($limit) ->setMaxResults($limit)
->setFirstResult($offset); ->setFirstResult($offset)
->orderBy('order')
->addOrderBy('id');
return $this->findEntities($qb); return $this->findEntities($qb);
} }
@@ -156,16 +157,12 @@ class CardMapper extends QBMapper implements IPermissionMapper {
} }
public function findDeleted($boardId, $limit = null, $offset = null) { public function findDeleted($boardId, $limit = null, $offset = null) {
$qb = $this->db->getQueryBuilder(); $qb = $this->queryCardsByBoard($boardId);
$qb->select('*') $qb->andWhere($qb->expr()->neq('c.deleted_at', $qb->createNamedParameter(0, IQueryBuilder::PARAM_INT)))
->from('deck_cards', 'c')
->join('c', 'deck_stacks', 's', $qb->expr()->eq('s.id', 'c.stack_id'))
->where($qb->expr()->eq('s.board_id', $qb->createNamedParameter($boardId)))
->andWhere($qb->expr()->neq('c.archived', $qb->createNamedParameter(true)))
->andWhere($qb->expr()->neq('c.deleted_at', $qb->createNamedParameter(0)))
->orderBy('c.order')
->setMaxResults($limit) ->setMaxResults($limit)
->setFirstResult($offset); ->setFirstResult($offset)
->orderBy('order')
->addOrderBy('id');
return $this->findEntities($qb); return $this->findEntities($qb);
} }
@@ -305,8 +302,8 @@ class CardMapper extends QBMapper implements IPermissionMapper {
public function removeLabel($card, $label) { public function removeLabel($card, $label) {
$qb = $this->db->getQueryBuilder(); $qb = $this->db->getQueryBuilder();
$qb->delete('deck_assigned_labels') $qb->delete('deck_assigned_labels')
->where($qb->expr()->eq('card_id', $qb->createNamedParameter($card))) ->where($qb->expr()->eq('card_id', $qb->createNamedParameter($card, IQueryBuilder::PARAM_INT)))
->andWhere($qb->expr()->eq('label_id', $qb->createNamedParameter($label))); ->andWhere($qb->expr()->eq('label_id', $qb->createNamedParameter($label, IQueryBuilder::PARAM_INT)));
$qb->execute(); $qb->execute();
} }