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

Merge pull request #1727 from nextcloud/bugfix/harden-order

Browse Source
This commit is contained in:
Julius Härtl
2020-04-21 09:21:46 +02:00
committed by GitHub
parent 35f35297bc 141ab46b46
commit bf8810e6e0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Db/CardMapper.php
View File

@@ -109,7 +109,7 @@ class CardMapper extends DeckMapper implements IPermissionMapper {
*/
public function find($id) {
$sql = 'SELECT * FROM `*PREFIX*deck_cards` ' .
'WHERE `id` = ?';
'WHERE `id` = ? ORDER BY `order`, `id`';
/** @var Card $card */
$card = $this->findEntity($sql, [$id]);
$labels = $this->labelMapper->findAssignedLabelsForCard($card->id);
@@ -120,14 +120,14 @@ class CardMapper extends DeckMapper implements IPermissionMapper {
public function findAll($stackId, $limit = null, $offset = null, $since = -1) {
$sql = 'SELECT * FROM `*PREFIX*deck_cards`
WHERE `stack_id` = ? AND NOT archived AND deleted_at = 0 AND last_modified > ? ORDER BY `order`';
WHERE `stack_id` = ? AND NOT archived AND deleted_at = 0 AND last_modified > ? ORDER BY `order`, `id`';
return $this->findEntities($sql, [$stackId, $since], $limit, $offset);
}
public function findDeleted($boardId, $limit = null, $offset = null) {
$sql = 'SELECT c.* FROM `*PREFIX*deck_cards` c
INNER JOIN `*PREFIX*deck_stacks` s ON s.id = c.stack_id
WHERE `s`.`board_id` = ? AND NOT c.archived AND NOT c.deleted_at = 0 ORDER BY `c`.`order`';
WHERE `s`.`board_id` = ? AND NOT c.archived AND NOT c.deleted_at = 0 ORDER BY `c`.`order`, `c`.`id`';
return $this->findEntities($sql, [$boardId], $limit, $offset);
}
@@ -138,7 +138,7 @@ class CardMapper extends DeckMapper implements IPermissionMapper {
public function findAllByStack($stackId, $limit = null, $offset = null) {
$sql = 'SELECT id FROM `*PREFIX*deck_cards`
WHERE `stack_id` = ?';
WHERE `stack_id` = ? ORDER BY `order`, `id`';
return $this->findEntities($sql, [$stackId], $limit, $offset);
}

2
src/store/card.js
View File

@@ -85,7 +85,7 @@ export default {
return card.title.toLowerCase().includes(getters.getSearchQuery.toLowerCase())
|| card.description.toLowerCase().includes(getters.getSearchQuery.toLowerCase())
})
.sort((a, b) => a.order - b.order)
.sort((a, b) => a.order - b.order || a.createdAt - b.createdAt)
},
cardById: state => (id) => {
return state.cards.find((card) => card.id === id)