From c31033d1ec74d62bd4706ec8dc0941bc8f2b8c6b Mon Sep 17 00:00:00 2001 From: Haris Macic Date: Tue, 20 Jan 2026 17:15:51 +0100 Subject: [PATCH 1/4] [#5602] Address QA comment, fix bug with user not being saved after clicking on assign to me --- .../submodules/ticketDetails.sub.php | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php b/app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php index 309df5eede..4ad25e9c45 100644 --- a/app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php +++ b/app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php @@ -220,6 +220,47 @@ function loadStatusHistory(ticketId) { }); } +window.assignToMe = function() { + const userId = ; + const $editorSelect = $('#editorId'); + const currentEditorId = $editorSelect.val(); + + if (currentEditorId == userId) { + return; + } + + const ticketId = $('#status-change-log').data('ticket-id'); + const user = $('#status-select').data('user') || 'Unknown User'; + + const oldStatusText = $editorSelect.data('old-status'); + const newStatusText = ''; + + $editorSelect.val(userId).trigger('chosen:updated'); + $editorSelect.data('old-status', newStatusText); + + $.ajax({ + url: '/tickets/ticketHistoryController/logStatusChange', + method: 'POST', + data: { + ticketId: ticketId, + oldStatus: currentEditorId, + newStatus: userId, + oldStatusText: oldStatusText, + newStatusText: newStatusText, + user: user, + detailsAttributeId: 'editorId' + }, + success: function(response) { + $('.saveTicketBtn').trigger('click'); + loadStatusHistory(ticketId); + }, + error: function(xhr, status, error) { + console.error('Error saving status:', error); + console.error('Response:', xhr.responseText); + } + }); +}; + const ticketIdOnLoad = $('#status-change-log').data('ticket-id'); if (ticketIdOnLoad) { loadStatusHistory(ticketIdOnLoad); From 5d6517e902bfb7fdcb6aacf30e39cb4284aff64d Mon Sep 17 00:00:00 2001 From: Haris Macic Date: Tue, 20 Jan 2026 17:38:02 +0100 Subject: [PATCH 2/4] #5602 Resolve conflicts --- .../Tickets/Templates/submodules/ticketDetails.sub.php | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php b/app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php index 4ad25e9c45..ae5f9f7e41 100644 --- a/app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php +++ b/app/Domain/Tickets/Templates/submodules/ticketDetails.sub.php @@ -128,8 +128,7 @@ class="autosave-field"
- __('label.assign_to_me'); ?> - + __('label.assign_to_me'); ?>
@@ -219,7 +218,6 @@ function loadStatusHistory(ticketId) { } }); } - window.assignToMe = function() { const userId = ; const $editorSelect = $('#editorId'); @@ -319,7 +317,7 @@ function loadStatusHistory(ticketId) { const user = $(this).data('user') || 'Unknown User'; $.ajax({ - url: '/tickets/ticketHistoryController/logStatusChange', + url: '/tickets/ticketHistoryController/logStatusChange', method: 'POST', data: { ticketId: ticketId, @@ -331,7 +329,6 @@ function loadStatusHistory(ticketId) { detailsAttributeId: changedElementId }, success: function(response) { - console.log('Status change saved', response); loadStatusHistory(ticketId); }, error: function(xhr, status, error) { @@ -350,7 +347,6 @@ function loadStatusHistory(ticketId) { const oldStatusText = $(this).data('old-status'); const newStatusText = $(this).val(); const user = $(this).data('user') || 'Unknown User'; - console.log('Date: ', oldStatusText, newStatusText); $.ajax({ url: '/tickets/ticketHistoryController/logStatusChange', @@ -365,7 +361,6 @@ function loadStatusHistory(ticketId) { detailsAttributeId: changedElementId }, success: function(response) { - console.log('Status change saved', response); loadStatusHistory(ticketId); }, error: function(xhr, status, error) { From fa9a55aba179adbfc197671e40ac4259ec66a724 Mon Sep 17 00:00:00 2001 From: farukvukovic <104840615+farukvukovic@users.noreply.github.com> Date: Wed, 21 Jan 2026 13:42:45 +0100 Subject: [PATCH 3/4] [#5607] Fix column width My Work timesheets --- app/Domain/Timesheets/Templates/showMy.tpl.php | 10 ++++++---- package-lock.json | 7 ------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/app/Domain/Timesheets/Templates/showMy.tpl.php b/app/Domain/Timesheets/Templates/showMy.tpl.php index eeed1deaec..20c124d7bd 100644 --- a/app/Domain/Timesheets/Templates/showMy.tpl.php +++ b/app/Domain/Timesheets/Templates/showMy.tpl.php @@ -275,7 +275,7 @@ -
+
@@ -422,10 +422,12 @@ class="hourCell" - - + + +
+
--
- get('allProjects') as $projectRow) { ?> =12.0.0" } }, - "node_modules/flatpickr": { - "version": "4.6.13", - "resolved": "https://registry.npmjs.org/flatpickr/-/flatpickr-4.6.13.tgz", - "integrity": "sha512-97PMG/aywoYpB4IvbvUJi0RQi8vearvU0oov1WW3k0WZPBMrTQVqekSX5CjSG/M4Q3i6A/0FKXC7RyAoAUUSPw==", - "license": "MIT" - }, "node_modules/flatted": { "version": "3.3.3", "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", From d828d9f6e2232be1b4a99157004210c2f52bd681 Mon Sep 17 00:00:00 2001 From: Haris Macic Date: Tue, 27 Jan 2026 10:21:18 +0100 Subject: [PATCH 4/4] [#5708] Resize type label --- app/Domain/Timesheets/Templates/showMy.tpl.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Domain/Timesheets/Templates/showMy.tpl.php b/app/Domain/Timesheets/Templates/showMy.tpl.php index 20c124d7bd..14aae45568 100644 --- a/app/Domain/Timesheets/Templates/showMy.tpl.php +++ b/app/Domain/Timesheets/Templates/showMy.tpl.php @@ -427,7 +427,7 @@ class="hourCell"
-
- get('allProjects') as $projectRow) { ?>
- get('kind') as $key => $kindRow) { ?> '.$tpl->__($kindRow).''; ?>