From e2bdf91f1cb79db00b4e87c376f3985d359f7138 Mon Sep 17 00:00:00 2001 From: Korina Cordero Date: Wed, 1 Jun 2022 08:01:39 +0000 Subject: [PATCH] Add checking for current job order that current jo is the selected jo. #675 --- src/Service/JobOrderHandler/ResqJobOrderHandler.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php index 95f7d141..a186aaa6 100644 --- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php +++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php @@ -1398,7 +1398,8 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface $old_rider = $obj->getRider(); if ($old_rider != null) { - if ($old_rider->getCurrentJobOrder() != null) + if (($old_rider->getCurrentJobOrder() != null) && + ($old_rider->getCurrentJobOrder()->getID() == $obj->getID())) { $old_rider->setCurrentJobOrder(); // set available flag for first rider @@ -1660,7 +1661,8 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface $old_rider = $obj->getRider(); if ($old_rider != null) { - if ($old_rider->getCurrentJobOrder() != null) + if (($old_rider->getCurrentJobOrder() != null) && + ($old_rider->getCurrentJobOrder()->getID() == $obj->getID())) { $old_rider->setCurrentJobOrder(); // set available flag for first rider