@@ -154,6 +154,7 @@
top: 110px;
justify-content: flex-start;
z-index: 9;
+ margin-bottom:50px;
">
get('allKanbanColumns') as $key => $statusRow) { ?>
From 45c872f9b3858d9b844343590aff893cb32559ee Mon Sep 17 00:00:00 2001
From: Haris Macic
Date: Mon, 22 Dec 2025 12:43:30 +0100
Subject: [PATCH 14/19] #5191 Fix bug with margin showing above kanban
---
app/Domain/Tickets/Templates/showKanban.tpl.php | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/app/Domain/Tickets/Templates/showKanban.tpl.php b/app/Domain/Tickets/Templates/showKanban.tpl.php
index 59e1398893..e920992bb5 100644
--- a/app/Domain/Tickets/Templates/showKanban.tpl.php
+++ b/app/Domain/Tickets/Templates/showKanban.tpl.php
@@ -99,9 +99,7 @@
displaySubmodule('tickets-ticketBoardTabs') ?>
-
-
-
+
get('allKanbanColumns') as $key => $statusRow) { ?>
From f0a0c9e3e02e7ab550e4a6dfc7e062a6bbf37fbb Mon Sep 17 00:00:00 2001
From: Haris Macic
Date: Mon, 22 Dec 2025 11:00:33 +0100
Subject: [PATCH 15/19] #5289 Add label total, and add sum of hours in table
footer
---
app/Domain/Timesheets/Js/timesheetsController.js | 1 +
app/Domain/Timesheets/Templates/showAll.tpl.php | 11 ++++++-----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/app/Domain/Timesheets/Js/timesheetsController.js b/app/Domain/Timesheets/Js/timesheetsController.js
index 1527583784..ee510584d3 100644
--- a/app/Domain/Timesheets/Js/timesheetsController.js
+++ b/app/Domain/Timesheets/Js/timesheetsController.js
@@ -55,6 +55,7 @@ leantime.timesheetsController = (function () {
title: leantime.i18n.__("label.filename_fileexport"),
charset: 'utf-8',
bom: true,
+ footer:true,
exportOptions: {
orthogonal: 'export',
columns: ':visible',
diff --git a/app/Domain/Timesheets/Templates/showAll.tpl.php b/app/Domain/Timesheets/Templates/showAll.tpl.php
index 568bd1c575..874d47c08d 100644
--- a/app/Domain/Timesheets/Templates/showAll.tpl.php
+++ b/app/Domain/Timesheets/Templates/showAll.tpl.php
@@ -307,10 +307,10 @@ function updateProjectCountInline() {
__('label.id'); ?>
Tick.ID
__('label.date'); ?>
+ __('label.ticket'); ?>
__('label.hours'); ?>
__('label.plan_hours'); ?>
__('label.difference'); ?>
- __('label.ticket'); ?>
__('label.project'); ?>
__('label.client'); ?>
__('label.employee'); ?>
@@ -347,11 +347,12 @@ function updateProjectCountInline() {
date(); ?>
+ e($row['headline']); ?>
e($row['headline']); ?>
+
e($row['name']); ?>
e($row['clientName']); ?>
@@ -402,9 +403,9 @@ function updateProjectCountInline() {
- __('label.total_hours')?>
-
From ecc88a63a910b4d35428db2a643caae62bb7a8ac Mon Sep 17 00:00:00 2001
From: Haris Macic
Date: Mon, 22 Dec 2025 15:10:21 +0100
Subject: [PATCH 16/19] #5289 Remove total hours label
---
app/Domain/Timesheets/Templates/showAll.tpl.php | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/Domain/Timesheets/Templates/showAll.tpl.php b/app/Domain/Timesheets/Templates/showAll.tpl.php
index 874d47c08d..3a75087598 100644
--- a/app/Domain/Timesheets/Templates/showAll.tpl.php
+++ b/app/Domain/Timesheets/Templates/showAll.tpl.php
@@ -403,8 +403,8 @@ function updateProjectCountInline() {
-
From adc87e630a009b7bf63f96305b3d42676e4b4be5 Mon Sep 17 00:00:00 2001
From: Haris Macic
Date: Mon, 22 Dec 2025 15:18:19 +0100
Subject: [PATCH 17/19] #5289 Address PR comments, format one line of code
---
app/Domain/Timesheets/Js/timesheetsController.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/Domain/Timesheets/Js/timesheetsController.js b/app/Domain/Timesheets/Js/timesheetsController.js
index ee510584d3..0d89a0d9ba 100644
--- a/app/Domain/Timesheets/Js/timesheetsController.js
+++ b/app/Domain/Timesheets/Js/timesheetsController.js
@@ -55,7 +55,7 @@ leantime.timesheetsController = (function () {
title: leantime.i18n.__("label.filename_fileexport"),
charset: 'utf-8',
bom: true,
- footer:true,
+ footer: true,
exportOptions: {
orthogonal: 'export',
columns: ':visible',
From 3fda9542a27d508dbaba45bb6f1dbd00a04822ce Mon Sep 17 00:00:00 2001
From: Haris Macic
Date: Tue, 23 Dec 2025 17:21:54 +0100
Subject: [PATCH 18/19] #5341 Fix bugs with moving ticket on kanban board and
changing priority on kanban board
---
app/Domain/Tickets/Services/Tickets.php | 102 +++++++++++++++---------
1 file changed, 64 insertions(+), 38 deletions(-)
diff --git a/app/Domain/Tickets/Services/Tickets.php b/app/Domain/Tickets/Services/Tickets.php
index 26c7f3cf4a..963b50be41 100644
--- a/app/Domain/Tickets/Services/Tickets.php
+++ b/app/Domain/Tickets/Services/Tickets.php
@@ -2029,60 +2029,86 @@ public function updateTicketSorting($params)
*
* @api
*/
- public function updateTicketStatusAndSorting($params, $handler = null): bool
- {
+public function updateTicketStatusAndSorting($params, $handler = null): bool
+{
+ foreach ($params as $status => $ticketList) {
+ if (is_numeric($status) && ! empty($ticketList)) {
+ $tickets = explode('&', $ticketList);
+
+ if (is_array($tickets) === true) {
+ foreach ($tickets as $key => $ticketString) {
+ $id = substr($ticketString, 9);
- // Jquery sortable serializes the array for kanban in format
- // statusKey: ticket[]=X&ticket[]=X2...,
- // statusKey2: ticket[]=X&ticket[]=X2...,
- // This represents status & kanban sorting
- foreach ($params as $status => $ticketList) {
- if (is_numeric($status) && ! empty($ticketList)) {
- $tickets = explode('&', $ticketList);
+ try {
+ $oldTicket = $this->getTicket($id);
+ $oldStatus = $oldTicket ? $oldTicket->status : null;
+ } catch (\Exception $e) {
+ error_log('Error getting old ticket status: ' . $e->getMessage());
+ $oldStatus = null;
+ }
- if (is_array($tickets) === true) {
- foreach ($tickets as $key => $ticketString) {
- $id = substr($ticketString, 9);
+ if ($this->ticketRepository->updateTicketStatus($id, $status, ($key * 100), $handler) === false) {
+ return false;
+ }
- if ($this->ticketRepository->updateTicketStatus($id, $status, ($key * 100), $handler) === false) {
- return false;
+ if ($oldStatus !== null && $oldStatus != $status) {
+ try {
+ $statusLabels = $this->getStatusLabels();
+ $currentUserName = session('userdata.name') ?? 'Unknown User';
+
+ $oldStatusText = $statusLabels[$oldStatus]['name'] ?? 'Unknown';
+ $newStatusText = $statusLabels[$status]['name'] ?? 'Unknown';
+
+ $ticketHistoryModel = app()->make(\Leantime\Domain\Tickets\Models\TicketHistoryModel::class);
+
+ $ticketHistoryModel->addStatusChange(
+ $id,
+ $oldStatus,
+ $status,
+ $oldStatusText,
+ $newStatusText,
+ $currentUserName,
+ 'kanban-board'
+ );
+ } catch (\Exception $e) {
+ error_log('Failed to log kanban status change: ' . $e->getMessage());
}
}
}
}
}
+ }
- if ($handler) {
- // Assumes format ticket_ID
- $id = substr($handler, 7);
+ if ($handler) {
+ $id = substr($handler, 7);
- $ticket = $this->getTicket($id);
+ $ticket = $this->getTicket($id);
- if ($ticket) {
- $subject = sprintf($this->language->__('email_notifications.todo_update_subject'), $id, strip_tags($ticket->headline));
- $actual_link = BASE_URL.'/dashboard/home#/tickets/showTicket/'.$id;
- $message = sprintf('%1$s has the ticket ready to test: \'%2$s\'', session('userdata.name'), strip_tags($ticket->headline));
+ if ($ticket) {
+ $subject = sprintf($this->language->__('email_notifications.todo_update_subject'), $id, strip_tags($ticket->headline));
+ $actual_link = BASE_URL.'/dashboard/home#/tickets/showTicket/'.$id;
+ $message = sprintf('%1$s has the ticket ready to test: \'%2$s\'', session('userdata.name'), strip_tags($ticket->headline));
- $notification = app()->make(NotificationModel::class);
- $notification->url = [
- 'url' => $actual_link,
- 'text' => $this->language->__('email_notifications.todo_update_cta'),
- ];
- $notification->entity = $ticket;
- $notification->module = 'tickets';
- $notification->projectId = $ticket->projectId ?? session('currentProject') ?? -1;
- $notification->subject = $subject;
- $notification->authorId = session('userdata.id') ?? -1;
- $notification->message = $message;
+ $notification = app()->make(NotificationModel::class);
+ $notification->url = [
+ 'url' => $actual_link,
+ 'text' => $this->language->__('email_notifications.todo_update_cta'),
+ ];
+ $notification->entity = $ticket;
+ $notification->module = 'tickets';
+ $notification->projectId = $ticket->projectId ?? session('currentProject') ?? -1;
+ $notification->subject = $subject;
+ $notification->authorId = session('userdata.id') ?? -1;
+ $notification->message = $message;
- $this->projectService->notifyProjectUsers($notification);
- }
+ $this->projectService->notifyProjectUsers($notification);
}
+ }
- self::dispatchEvent('ticket_updated');
+ self::dispatchEvent('ticket_updated');
- return true;
- }
+ return true;
+}
// Delete
/**
From e88b356906c0ed052155cb190529e3bccf78475f Mon Sep 17 00:00:00 2001
From: Haris Macic
Date: Tue, 23 Dec 2025 17:26:59 +0100
Subject: [PATCH 19/19] #5341 Format code
---
app/Domain/Tickets/Services/Tickets.php | 205 +++++++++++++++++-------
1 file changed, 145 insertions(+), 60 deletions(-)
diff --git a/app/Domain/Tickets/Services/Tickets.php b/app/Domain/Tickets/Services/Tickets.php
index 963b50be41..7712fa9a8b 100644
--- a/app/Domain/Tickets/Services/Tickets.php
+++ b/app/Domain/Tickets/Services/Tickets.php
@@ -1828,51 +1828,136 @@ public function updateTicket($values): array|bool
*
* @api
*/
- public function patch($id, $params): bool
- {
+public function patch($id, $params): bool
+{
+ if (is_array($params)) {
+ unset($params['id']);
+ unset($params['act']);
+ }
- // $params is an array of field names. Exclude id
- if (is_array($params)) {
- unset($params['id']);
- unset($params['act']);
- }
+ $ticket = $this->getTicket($id);
- $ticket = $this->getTicket($id);
+ if (! $ticket) {
+ return false;
+ }
- if (! $ticket) {
- return false;
+ $oldValues = [];
+ $fieldsToLog = ['priority', 'storypoints', 'editorId'];
+
+ foreach ($fieldsToLog as $field) {
+ if (isset($params[$field])) {
+ $oldValues[$field] = $ticket->$field ?? null;
}
+ }
- $params = $this->prepareTicketDates($params);
+ $params = $this->prepareTicketDates($params);
- $return = $this->ticketRepository->patchTicket($id, $params);
+ $return = $this->ticketRepository->patchTicket($id, $params);
- self::dispatchEvent('ticket_updated');
+ if ($return) {
+ $this->logPatchChanges($id, $oldValues, $params, $ticket);
+ }
- // Todo: create events and move notification logic to notification module
- if (isset($params['status']) && $return) {
- $ticket = $this->getTicket($id);
- $subject = sprintf($this->language->__('email_notifications.todo_update_subject'), $id, strip_tags($ticket->headline));
- $actual_link = BASE_URL.'/dashboard/home#/tickets/showTicket/'.$id;
- $message = sprintf($this->language->__('email_notifications.todo_update_message'), session('userdata.name'), strip_tags($ticket->headline));
+ self::dispatchEvent('ticket_updated');
- $notification = app()->make(NotificationModel::class);
- $notification->url = [
- 'url' => $actual_link,
- 'text' => $this->language->__('email_notifications.todo_update_cta'),
- ];
- $notification->entity = $ticket;
- $notification->module = 'tickets';
- $notification->projectId = $ticket->projectId ?? session('currentProject') ?? -1;
- $notification->subject = $subject;
- $notification->authorId = session('userdata.id');
- $notification->message = $message;
+ if (isset($params['status']) && $return) {
+ $ticket = $this->getTicket($id);
+ $subject = sprintf($this->language->__('email_notifications.todo_update_subject'), $id, strip_tags($ticket->headline));
+ $actual_link = BASE_URL.'/dashboard/home#/tickets/showTicket/'.$id;
+ $message = sprintf($this->language->__('email_notifications.todo_update_message'), session('userdata.name'), strip_tags($ticket->headline));
+
+ $notification = app()->make(NotificationModel::class);
+ $notification->url = [
+ 'url' => $actual_link,
+ 'text' => $this->language->__('email_notifications.todo_update_cta'),
+ ];
+ $notification->entity = $ticket;
+ $notification->module = 'tickets';
+ $notification->projectId = $ticket->projectId ?? session('currentProject') ?? -1;
+ $notification->subject = $subject;
+ $notification->authorId = session('userdata.id');
+ $notification->message = $message;
- $this->projectService->notifyProjectUsers($notification);
+ $this->projectService->notifyProjectUsers($notification);
+ }
+
+ return $return;
+}
+
+private function logPatchChanges($ticketId, $oldValues, $newParams, $oldTicket)
+{
+ try {
+ $ticketHistoryModel = app()->make(\Leantime\Domain\Tickets\Models\TicketHistoryModel::class);
+ $currentUserName = session('userdata.name') ?? 'Unknown User';
+
+ if (isset($newParams['priority']) && isset($oldValues['priority']) && $oldValues['priority'] != $newParams['priority']) {
+ $priorities = $this->getPriorityLabels();
+ $oldPriorityText = $priorities[$oldValues['priority']] ?? 'Priority not defined';
+ $newPriorityText = $priorities[$newParams['priority']] ?? 'Priority not defined';
+
+ $ticketHistoryModel->addStatusChange(
+ $ticketId,
+ $oldValues['priority'],
+ $newParams['priority'],
+ $oldPriorityText,
+ $newPriorityText,
+ $currentUserName,
+ 'priority'
+ );
+ }
+
+ if (isset($newParams['storypoints']) && isset($oldValues['storypoints']) && $oldValues['storypoints'] != $newParams['storypoints']) {
+ $efforts = $this->getEffortLabels();
+ $oldEffortText = $efforts[$oldValues['storypoints']] ?? 'Effort not defined';
+ $newEffortText = $efforts[$newParams['storypoints']] ?? 'Effort not defined';
+
+ $ticketHistoryModel->addStatusChange(
+ $ticketId,
+ $oldValues['storypoints'],
+ $newParams['storypoints'],
+ $oldEffortText,
+ $newEffortText,
+ $currentUserName,
+ 'storypoints'
+ );
+ }
+
+ if (isset($newParams['editorId']) && isset($oldValues['editorId']) && $oldValues['editorId'] != $newParams['editorId']) {
+ $users = $this->ticketRepository->getUsersAssignedToProject(session('currentProject'));
+
+ $oldEditorText = 'Not assigned';
+ foreach ($users as $user) {
+ if ($user['id'] == $oldValues['editorId']) {
+ $oldEditorText = $user['firstname'] . ' ' . $user['lastname'];
+ break;
+ }
+ }
+
+ $newEditorText = 'Not assigned';
+ if ($newParams['editorId']) {
+ foreach ($users as $user) {
+ if ($user['id'] == $newParams['editorId']) {
+ $newEditorText = $user['firstname'] . ' ' . $user['lastname'];
+ break;
+ }
+ }
+ }
+
+ $ticketHistoryModel->addStatusChange(
+ $ticketId,
+ $oldValues['editorId'],
+ $newParams['editorId'],
+ $oldEditorText,
+ $newEditorText,
+ $currentUserName,
+ 'editorId'
+ );
}
- return $return;
+ } catch (\Exception $e) {
+ error_log('Failed to log patch changes: ' . $e->getMessage());
}
+}
/**
* moveTicket - Moves a ticket from one project to another. Milestone children will be moved as well
@@ -2029,8 +2114,8 @@ public function updateTicketSorting($params)
*
* @api
*/
-public function updateTicketStatusAndSorting($params, $handler = null): bool
-{
+ public function updateTicketStatusAndSorting($params, $handler = null): bool
+ {
foreach ($params as $status => $ticketList) {
if (is_numeric($status) && ! empty($ticketList)) {
$tickets = explode('&', $ticketList);
@@ -2047,9 +2132,9 @@ public function updateTicketStatusAndSorting($params, $handler = null): bool
$oldStatus = null;
}
- if ($this->ticketRepository->updateTicketStatus($id, $status, ($key * 100), $handler) === false) {
- return false;
- }
+ if ($this->ticketRepository->updateTicketStatus($id, $status, ($key * 100), $handler) === false) {
+ return false;
+ }
if ($oldStatus !== null && $oldStatus != $status) {
try {
@@ -2079,36 +2164,36 @@ public function updateTicketStatusAndSorting($params, $handler = null): bool
}
}
- if ($handler) {
- $id = substr($handler, 7);
+ if ($handler) {
+ $id = substr($handler, 7);
- $ticket = $this->getTicket($id);
+ $ticket = $this->getTicket($id);
- if ($ticket) {
- $subject = sprintf($this->language->__('email_notifications.todo_update_subject'), $id, strip_tags($ticket->headline));
- $actual_link = BASE_URL.'/dashboard/home#/tickets/showTicket/'.$id;
- $message = sprintf('%1$s has the ticket ready to test: \'%2$s\'', session('userdata.name'), strip_tags($ticket->headline));
+ if ($ticket) {
+ $subject = sprintf($this->language->__('email_notifications.todo_update_subject'), $id, strip_tags($ticket->headline));
+ $actual_link = BASE_URL.'/dashboard/home#/tickets/showTicket/'.$id;
+ $message = sprintf('%1$s has the ticket ready to test: \'%2$s\'', session('userdata.name'), strip_tags($ticket->headline));
- $notification = app()->make(NotificationModel::class);
- $notification->url = [
- 'url' => $actual_link,
- 'text' => $this->language->__('email_notifications.todo_update_cta'),
- ];
- $notification->entity = $ticket;
- $notification->module = 'tickets';
- $notification->projectId = $ticket->projectId ?? session('currentProject') ?? -1;
- $notification->subject = $subject;
- $notification->authorId = session('userdata.id') ?? -1;
- $notification->message = $message;
+ $notification = app()->make(NotificationModel::class);
+ $notification->url = [
+ 'url' => $actual_link,
+ 'text' => $this->language->__('email_notifications.todo_update_cta'),
+ ];
+ $notification->entity = $ticket;
+ $notification->module = 'tickets';
+ $notification->projectId = $ticket->projectId ?? session('currentProject') ?? -1;
+ $notification->subject = $subject;
+ $notification->authorId = session('userdata.id') ?? -1;
+ $notification->message = $message;
- $this->projectService->notifyProjectUsers($notification);
+ $this->projectService->notifyProjectUsers($notification);
+ }
}
- }
- self::dispatchEvent('ticket_updated');
+ self::dispatchEvent('ticket_updated');
- return true;
-}
+ return true;
+ }
// Delete
/**