@@ -230,7 +230,7 @@ class CardMapper extends QBMapper implements IPermissionMapper {
|
|||||||
return $this->findEntities($qb);
|
return $this->findEntities($qb);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function findAssignedCards($boardId, $username) {
|
public function findToMeOrNotAssignedCards($boardId, $username) {
|
||||||
$qb = $this->db->getQueryBuilder();
|
$qb = $this->db->getQueryBuilder();
|
||||||
$qb->select('c.*')
|
$qb->select('c.*')
|
||||||
->from('deck_cards', 'c')
|
->from('deck_cards', 'c')
|
||||||
|
|||||||
@@ -608,16 +608,4 @@ class CardService {
|
|||||||
|
|
||||||
return $cards;
|
return $cards;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
*
|
|
||||||
* @return array
|
|
||||||
* @throws \OCA\Deck\NoPermissionException
|
|
||||||
* @throws BadRequestException
|
|
||||||
*/
|
|
||||||
public function findAssignedCards($userId) {
|
|
||||||
$cards = $this->cardMapper->findAssignedCards($userId);
|
|
||||||
|
|
||||||
return $cards;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -128,7 +128,7 @@ class OverviewService {
|
|||||||
$cardData = $card->jsonSerialize();
|
$cardData = $card->jsonSerialize();
|
||||||
$cardData['boardId'] = $userBoard->getId();
|
$cardData['boardId'] = $userBoard->getId();
|
||||||
return $cardData;
|
return $cardData;
|
||||||
}, $this->cardMapper->findAssignedCards($userBoard->getId(), $userId));
|
}, $this->cardMapper->findToMeOrNotAssignedCards($userBoard->getId(), $userId));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return $findCards;
|
return $findCards;
|
||||||
|
|||||||
Reference in New Issue
Block a user