Skip to content

Commit c3c97cf

Browse files
enjeckjuliusknorr
authored andcommittedJan 10, 2025
fix: Add teams usergroup value to column DTO
Signed-off-by: Cleopatra Enjeck M <[email protected]>
1 parent 67e608d commit c3c97cf

8 files changed

+21
-1
lines changed
 

‎lib/Controller/Api1Controller.php

+3
Original file line numberDiff line numberDiff line change
@@ -852,6 +852,7 @@ public function createColumn(
852852
usergroupMultipleItems: $usergroupMultipleItems,
853853
usergroupSelectUsers: $usergroupSelectUsers,
854854
usergroupSelectGroups: $usergroupSelectGroups,
855+
usergroupSelectTeams: $usergroupSelectTeams,
855856
showUserStatus: $usergroupShowUserStatus
856857
),
857858
$selectedViewIds
@@ -962,6 +963,7 @@ public function updateColumn(
962963
usergroupMultipleItems: $usergroupMultipleItems,
963964
usergroupSelectUsers: $usergroupSelectUsers,
964965
usergroupSelectGroups: $usergroupSelectGroups,
966+
usergroupSelectTeams: $usergroupSelectTeams,
965967
showUserStatus: $usergroupShowUserStatus
966968
)
967969
);
@@ -1575,6 +1577,7 @@ public function createTableColumn(
15751577
usergroupMultipleItems: $usergroupMultipleItems,
15761578
usergroupSelectUsers: $usergroupSelectUsers,
15771579
usergroupSelectGroups: $usergroupSelectGroups,
1580+
usergroupSelectTeams: $usergroupSelectTeams,
15781581
showUserStatus: $usergroupShowUserStatus
15791582
),
15801583
$selectedViewIds

‎lib/Controller/ApiColumnsController.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ public function createDatetimeColumn(int $baseNodeId, string $title, ?string $da
312312
*/
313313
#[NoAdminRequired]
314314
#[RequirePermission(permission: Application::PERMISSION_MANAGE, typeParam: 'baseNodeType', idParam: 'baseNodeId')]
315-
public function createUsergroupColumn(int $baseNodeId, string $title, ?string $usergroupDefault, bool $usergroupMultipleItems = null, bool $usergroupSelectUsers = null, bool $usergroupSelectGroups = null, bool $showUserStatus = null, string $description = null, ?array $selectedViewIds = [], bool $mandatory = false, string $baseNodeType = 'table'): DataResponse {
315+
public function createUsergroupColumn(int $baseNodeId, string $title, ?string $usergroupDefault, bool $usergroupMultipleItems = null, bool $usergroupSelectUsers = null, bool $usergroupSelectGroups = null, bool $usergroupSelectTeams = null, bool $showUserStatus = null, string $description = null, ?array $selectedViewIds = [], bool $mandatory = false, string $baseNodeType = 'table'): DataResponse {
316316
$tableId = $baseNodeType === 'table' ? $baseNodeId : null;
317317
$viewId = $baseNodeType === 'view' ? $baseNodeId : null;
318318
$column = $this->service->create(
@@ -328,6 +328,7 @@ public function createUsergroupColumn(int $baseNodeId, string $title, ?string $u
328328
usergroupMultipleItems: $usergroupMultipleItems,
329329
usergroupSelectUsers: $usergroupSelectUsers,
330330
usergroupSelectGroups: $usergroupSelectGroups,
331+
usergroupSelectTeams: $usergroupSelectTeams,
331332
showUserStatus: $showUserStatus
332333
),
333334
$selectedViewIds

‎lib/Controller/ApiTablesController.php

+1
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,7 @@ public function createFromScheme(string $title, string $emoji, string $descripti
165165
usergroupMultipleItems: $column['usergroupMultipleItems'],
166166
usergroupSelectUsers: $column['usergroupSelectUsers'],
167167
usergroupSelectGroups: $column['usergroupSelectGroups'],
168+
usergroupSelectTeams: $column['usergroupSelectTeams'],
168169
showUserStatus: $column['showUserStatus'],
169170
)
170171
);

‎lib/Controller/ColumnController.php

+2
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@ public function create(
160160
usergroupMultipleItems: $usergroupMultipleItems,
161161
usergroupSelectUsers: $usergroupSelectUsers,
162162
usergroupSelectGroups: $usergroupSelectGroups,
163+
usergroupSelectTeams: $usergroupSelectTeams,
163164
showUserStatus: $showUserStatus
164165
),
165166
$selectedViewIds
@@ -258,6 +259,7 @@ public function update(
258259
usergroupMultipleItems: $usergroupMultipleItems,
259260
usergroupSelectUsers: $usergroupSelectUsers,
260261
usergroupSelectGroups: $usergroupSelectGroups,
262+
usergroupSelectTeams: $usergroupSelectTeams,
261263
showUserStatus: $showUserStatus
262264
)
263265
);

‎lib/Db/Column.php

+1
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,7 @@ public static function fromDto(ColumnDto $data): self {
192192
$column->setUsergroupMultipleItems($data->getUsergroupMultipleItems());
193193
$column->setUsergroupSelectUsers($data->getUsergroupSelectUsers());
194194
$column->setUsergroupSelectGroups($data->getUsergroupSelectGroups());
195+
$column->setUsergroupSelectTeams($data->getUsergroupSelectTeams());
195196
$column->setShowUserStatus($data->getShowUserStatus());
196197
return $column;
197198
}

‎lib/Dto/Column.php

+6
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ public function __construct(
3030
private ?bool $usergroupMultipleItems = null,
3131
private ?bool $usergroupSelectUsers = null,
3232
private ?bool $usergroupSelectGroups = null,
33+
private ?bool $usergroupSelectTeams = null,
3334
private ?bool $showUserStatus = null,
3435
) {
3536
}
@@ -57,6 +58,7 @@ public static function createFromArray(array $data): self {
5758
$data['usergroupMultipleItems'] ?? null,
5859
$data['usergroupSelectUsers'] ?? null,
5960
$data['usergroupSelectGroups'] ?? null,
61+
$data['usergroupSelectTeams'] ?? null,
6062
$data['showUserStatus'] ?? null,
6163
);
6264
}
@@ -145,6 +147,10 @@ public function getUsergroupSelectGroups(): ?bool {
145147
return $this->usergroupSelectGroups;
146148
}
147149

150+
public function getUsergroupSelectTeams(): ?bool {
151+
return $this->usergroupSelectTeams;
152+
}
153+
148154
public function getShowUserStatus(): ?bool {
149155
return $this->showUserStatus;
150156
}

‎openapi.json

+4
Original file line numberDiff line numberDiff line change
@@ -7938,6 +7938,10 @@
79387938
"type": "boolean",
79397939
"description": "Whether you can select groups"
79407940
},
7941+
"usergroupSelectTeams": {
7942+
"type": "boolean",
7943+
"description": "Whether you can select teams"
7944+
},
79417945
"showUserStatus": {
79427946
"type": "boolean",
79437947
"description": "Whether to show the user's status"

‎src/types/openapi/openapi.ts

+2
Original file line numberDiff line numberDiff line change
@@ -4621,6 +4621,8 @@ export interface operations {
46214621
readonly usergroupSelectUsers?: boolean;
46224622
/** @description Whether you can select groups */
46234623
readonly usergroupSelectGroups?: boolean;
4624+
/** @description Whether you can select teams */
4625+
readonly usergroupSelectTeams?: boolean;
46244626
/** @description Whether to show the user's status */
46254627
readonly showUserStatus?: boolean;
46264628
/** @description Description */

0 commit comments

Comments
 (0)
Please sign in to comment.