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

Fix label assignment insertion and enrich result of clone

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2020-06-18 10:48:33 +02:00
committed by Jakob Röhrl
parent e763ce1fb7
commit c39fd43b6c
5 changed files with 25 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Db/AssignedLabels.php
View File

@@ -27,12 +27,13 @@ use JsonSerializable;
class AssignedLabels extends RelationalEntity implements JsonSerializable {
public $id;
protected $label;
protected $labelId;
protected $cardId;
public function __construct() {
$this->addType('id', 'integer');
$this->addType('cardId', 'integer');
$this->addResolvable('label');
$this->addType('labelId', 'integer');
}
}

6
lib/Db/AssignedLabelsMapper.php
View File

@@ -38,7 +38,7 @@ class AssignedLabelsMapper extends DeckMapper {
private $groupManager;
public function __construct(IDBConnection $db, CardMapper $cardMapper, IUserManager $userManager, IGroupManager $groupManager) {
parent::__construct($db, 'deck_assigned_labels', Labels::class);
parent::__construct($db, 'deck_assigned_labels', AssignedLabels::class);
$this->cardMapper = $cardMapper;
$this->userManager = $userManager;
$this->groupManager = $groupManager;
@@ -50,9 +50,7 @@ class AssignedLabelsMapper extends DeckMapper {
* @return array|Entity
*/
public function find($cardId) {
$sql = 'SELECT l.*,card_id FROM `*PREFIX*deck_assigned_labels` as al ' .
'INNER JOIN `*PREFIX*deck_labels` as l ON l.id = al.label_id ' .
'WHERE `card_id` = ?';
$sql = 'SELECT * from `*PREFIX*deck_assigned_labels` where `card_id` = ?';
$labels = $this->findEntities($sql, [$cardId]);
return $labels;