From 474109a5df0a06f5343ab184838fe2d80e3872a8 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sun, 11 Jan 2026 19:23:20 +0000
Subject: [PATCH] =Fixed timeline CRUD.js issue where this.activeItem was set null when we still needed it
---
inc/rest/routes/QueueRoutes.php | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/inc/rest/routes/QueueRoutes.php b/inc/rest/routes/QueueRoutes.php
index 0346eee..21bce8f 100644
--- a/inc/rest/routes/QueueRoutes.php
+++ b/inc/rest/routes/QueueRoutes.php
@@ -193,7 +193,8 @@
'progress_count' => intval($operation['progress_count'] ?? 0),
'count' => intval($operation['count'] ?? 1),
'retries' => intval($operation['retries'] ?? 0),
- 'data' => json_decode($operation['request_data'] ?? '{}', true)
+ 'data' => json_decode($operation['request_data'] ?? '{}', true),
+ 'result' => json_decode($operation['result']??'{}', true)
];
// Convert timestamps to ISO 8601 format with proper timezone
@@ -371,7 +372,7 @@
case 'cancel':
// Can only cancel pending/queued operations
if (!in_array($operation_status, ['pending', 'queued'])) {
- $errors[] = "Operation {$operation_id} cannot be cancelled (status: {$operation_status})";
+// $errors[] = "Operation {$operation_id} cannot be cancelled (status: {$operation_status})";
continue 2;
}
--
Gitblit v1.10.0