From 4636374af4cedb8f831dc5fc8a6438168e1dfbb5 Mon Sep 17 00:00:00 2001
From: aminovfariz <fariz.aminov2000@gmail.com>
Date: Tue, 23 Jun 2026 09:27:13 +0200
Subject: [PATCH] fix(helpdesk): clean up handover form field handling

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 modules/helpdesk/pages/helpdesk/handovers/_form.phtml   | 7 +++----
 modules/helpdesk/pages/helpdesk/handovers/create().php  | 3 +--
 modules/helpdesk/pages/helpdesk/handovers/edit($id).php | 3 +--
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/modules/helpdesk/pages/helpdesk/handovers/_form.phtml b/modules/helpdesk/pages/helpdesk/handovers/_form.phtml
index c88714b..d2230d1 100644
--- a/modules/helpdesk/pages/helpdesk/handovers/_form.phtml
+++ b/modules/helpdesk/pages/helpdesk/handovers/_form.phtml
@@ -72,19 +72,18 @@ $hasDiff = $fieldDiff !== [];
         </label>
         <select
           id="<?php e($inputId); ?>"
-          name="field_<?php e($key); ?>[]"
-          multiple
-          size="5"
+          name="field_<?php e($key); ?>"
           <?php if ($required): ?> aria-required="true"<?php endif; ?>
           <?php if ($readonly): ?> disabled<?php endif; ?>
         >
+          <option value=""><?php e(t('Please select...')); ?></option>
           <?php foreach ($tenantUsers as $u):
               $uId = (string) ($u['u']['id'] ?? $u['id'] ?? '');
               $uName = trim((string) ($u['u']['display_name'] ?? $u['display_name'] ?? ''));
               $uEmail = (string) ($u['u']['email'] ?? $u['email'] ?? '');
               $uLabel = $uName !== '' ? $uName : $uEmail;
           ?>
-            <option value="<?php e($uId); ?>"<?php if (in_array($uId, $selectedIds, true)): ?> selected<?php endif; ?>>
+            <option value="<?php e($uId); ?>"<?php if ($value === $uId): ?> selected<?php endif; ?>>
               <?php e($uLabel); ?>
             </option>
           <?php endforeach; ?>
diff --git a/modules/helpdesk/pages/helpdesk/handovers/create().php b/modules/helpdesk/pages/helpdesk/handovers/create().php
index 82fc70e..562aed8 100644
--- a/modules/helpdesk/pages/helpdesk/handovers/create().php
+++ b/modules/helpdesk/pages/helpdesk/handovers/create().php
@@ -258,8 +258,7 @@ if ($step === $protocolStep) {
             if ($type === 'checkbox') {
                 $fieldValues[$key] = $request->body('field_' . $key, '') !== '' ? '1' : '0';
             } elseif ($type === 'user-select') {
-                $ids = $request->body('field_' . $key, []);
-                $fieldValues[$key] = json_encode(array_values(array_filter((array) $ids)));
+                $fieldValues[$key] = (string) $request->body('field_' . $key, '');
             } else {
                 $fieldValues[$key] = (string) $request->body('field_' . $key, '');
             }
diff --git a/modules/helpdesk/pages/helpdesk/handovers/edit($id).php b/modules/helpdesk/pages/helpdesk/handovers/edit($id).php
index 1663b36..940b447 100644
--- a/modules/helpdesk/pages/helpdesk/handovers/edit($id).php
+++ b/modules/helpdesk/pages/helpdesk/handovers/edit($id).php
@@ -149,8 +149,7 @@ if ($request->isMethod('POST') && $canEdit) {
         if ($type === 'checkbox') {
             $submittedValues[$key] = $request->body('field_' . $key, '') !== '' ? '1' : '0';
         } elseif ($type === 'user-select') {
-            $ids = $request->body('field_' . $key, []);
-            $submittedValues[$key] = json_encode(array_values(array_filter((array) $ids)));
+            $submittedValues[$key] = (string) $request->body('field_' . $key, '');
         } else {
             $submittedValues[$key] = (string) $request->body('field_' . $key, '');
         }