fa/breadcrumb-the-shire
1
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(helpdesk): always load tenant users, not only when schema has user-select

Browse Source 
Schema snapshot on existing handovers may predate the field type change,
so the conditional check was false and tenantUsers was empty.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
aminovfariz
2026-06-08 11:57:02 +02:00
parent 40b94fa891
commit e3dfdef76f
2 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/helpdesk/pages/helpdesk/handovers/create().php
View File

@@ -230,20 +230,16 @@ if ($step === $protocolStep) {
? $product['name'] ? $product['name']
: (string) ($product['bc_description'] ?? $wizardData['product_code']); : (string) ($product['bc_description'] ?? $wizardData['product_code']);
// Load tenant users for user-select schema fields // Load tenant users — always available for user-select schema fields
$hasUserSelectField = !empty(array_filter($schemaFields, fn($f) => ($f['type'] ?? '') === 'user-select')); $rows = DB::select(
$tenantUsers = []; 'SELECT u.id, u.display_name, u.email'
if ($hasUserSelectField) { . ' FROM users u'
$rows = DB::select( . ' JOIN user_tenants ut ON ut.user_id = u.id'
'SELECT u.id, u.display_name, u.email' . ' WHERE ut.tenant_id = ? AND u.active = 1'
. ' FROM users u' . ' ORDER BY u.display_name ASC',
. ' JOIN user_tenants ut ON ut.user_id = u.id' (string) $currentTenantId
. ' WHERE ut.tenant_id = ? AND u.active = 1' );
. ' ORDER BY u.display_name ASC', $tenantUsers = is_array($rows) ? $rows : [];
(string) $currentTenantId
);
$tenantUsers = is_array($rows) ? $rows : [];
}
if ($request->isMethod('POST')) { if ($request->isMethod('POST')) {
if (!Session::checkCsrfToken()) { if (!Session::checkCsrfToken()) {

24
modules/helpdesk/pages/helpdesk/handovers/edit($id).php
View File

@@ -205,20 +205,16 @@ if ($request->isMethod('POST') && $canEdit) {
$validationSummaryErrors = $errorBag->toArray(); $validationSummaryErrors = $errorBag->toArray();
$errors = $errorBag->toFlatList(); $errors = $errorBag->toFlatList();
// Load tenant users for user-select schema fields // Load tenant users — always available for user-select schema fields
$hasUserSelectField = !empty(array_filter($schemaFields, fn($f) => ($f['type'] ?? '') === 'user-select')); $rows = DB::select(
$tenantUsers = []; 'SELECT u.id, u.display_name, u.email'
if ($hasUserSelectField) { . ' FROM users u'
$rows = DB::select( . ' JOIN user_tenants ut ON ut.user_id = u.id'
'SELECT u.id, u.display_name, u.email' . ' WHERE ut.tenant_id = ? AND u.active = 1'
. ' FROM users u' . ' ORDER BY u.display_name ASC',
. ' JOIN user_tenants ut ON ut.user_id = u.id' (string) $tenantId
. ' WHERE ut.tenant_id = ? AND u.active = 1' );
. ' ORDER BY u.display_name ASC', $tenantUsers = is_array($rows) ? $rows : [];
(string) $tenantId
);
$tenantUsers = is_array($rows) ? $rows : [];
}
// Load revision data // Load revision data
$revisions = $revisionService->listByHandover($tenantId, $handoverId); $revisions = $revisionService->listByHandover($tenantId, $handoverId);