fix(helpdesk): handle nested table key from DB::select in user dropdowns
MintyPHP DB returns rows as $row[$table][$field], so tenant users come back as $u['u']['id'] not $u['id']. Added fallback for both. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -48,9 +48,13 @@ $currentStatus = (string) ($handover['status'] ?? '');
|
|||||||
<?php if (!empty($errors['assigned_to'])): ?>aria-describedby="assigned_to_error"<?php endif; ?>
|
<?php if (!empty($errors['assigned_to'])): ?>aria-describedby="assigned_to_error"<?php endif; ?>
|
||||||
>
|
>
|
||||||
<option value=""><?php e(t('— Select employee —')); ?></option>
|
<option value=""><?php e(t('— Select employee —')); ?></option>
|
||||||
<?php foreach ($tenantUsers as $u): ?>
|
<?php foreach ($tenantUsers as $u):
|
||||||
<option value="<?php e($u['id']); ?>"<?php if ((int) $u['id'] === $currentAssignedTo): ?> selected<?php endif; ?>>
|
$uId = (int) ($u['u']['id'] ?? $u['id'] ?? 0);
|
||||||
<?php e($u['display_name'] ?: $u['email']); ?>
|
$uName = (string) ($u['u']['display_name'] ?? $u['display_name'] ?? '');
|
||||||
|
$uEmail = (string) ($u['u']['email'] ?? $u['email'] ?? '');
|
||||||
|
?>
|
||||||
|
<option value="<?php e($uId); ?>"<?php if ($uId === $currentAssignedTo): ?> selected<?php endif; ?>>
|
||||||
|
<?php e($uName ?: $uEmail); ?>
|
||||||
</option>
|
</option>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
@@ -117,9 +117,13 @@ $tenantUsers = is_array($tenantUsers ?? null) ? $tenantUsers : [];
|
|||||||
<label for="wizard-assigned-to"><?php e(t('Assign to (optional)')); ?></label>
|
<label for="wizard-assigned-to"><?php e(t('Assign to (optional)')); ?></label>
|
||||||
<select id="wizard-assigned-to" name="assigned_to">
|
<select id="wizard-assigned-to" name="assigned_to">
|
||||||
<option value="0"><?php e(t('— Not assigned yet —')); ?></option>
|
<option value="0"><?php e(t('— Not assigned yet —')); ?></option>
|
||||||
<?php foreach ($tenantUsers as $u): ?>
|
<?php foreach ($tenantUsers as $u):
|
||||||
<option value="<?php e($u['id']); ?>"<?php if ((int) ($form['assigned_to'] ?? 0) === (int) $u['id']): ?> selected<?php endif; ?>>
|
$uId = (int) ($u['u']['id'] ?? $u['id'] ?? 0);
|
||||||
<?php e($u['display_name'] ?: $u['email']); ?>
|
$uName = (string) ($u['u']['display_name'] ?? $u['display_name'] ?? '');
|
||||||
|
$uEmail = (string) ($u['u']['email'] ?? $u['email'] ?? '');
|
||||||
|
?>
|
||||||
|
<option value="<?php e($uId); ?>"<?php if ((int) ($form['assigned_to'] ?? 0) === $uId): ?> selected<?php endif; ?>>
|
||||||
|
<?php e($uName ?: $uEmail); ?>
|
||||||
</option>
|
</option>
|
||||||
<?php endforeach; ?>
|
<?php endforeach; ?>
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
Reference in New Issue
Block a user