From 1a0fb13268addf1d9a41c1720c9b69f37099676b Mon Sep 17 00:00:00 2001 From: Kendrick Chan Date: Mon, 24 Feb 2020 16:43:27 +0800 Subject: [PATCH] Fix view all edit button to use one step edit for CMB #270 --- src/Controller/JobOrderController.php | 6 ++++-- src/Service/JobOrderHandler/CMBJobOrderHandler.php | 5 +++++ src/Service/JobOrderHandler/ResqJobOrderHandler.php | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/Controller/JobOrderController.php b/src/Controller/JobOrderController.php index c06383c7..f04ba047 100644 --- a/src/Controller/JobOrderController.php +++ b/src/Controller/JobOrderController.php @@ -276,12 +276,14 @@ class JobOrderController extends Controller { $rows[$key]['meta']['reassign_hub_url'] = $this->generateUrl('jo_open_hub_form', ['id' => $jo_id]); $rows[$key]['meta']['reassign_rider_url'] = $this->generateUrl('jo_open_rider_form', ['id' => $jo_id]); - $rows[$key]['meta']['edit_url'] = $this->generateUrl('jo_open_edit_form', ['id' => $jo_id]); + // $rows[$key]['meta']['edit_url'] = $this->generateUrl('jo_open_edit_form', ['id' => $jo_id]); + $rows[$key]['meta']['edit_url'] = $this->generateUrl($jo_handler->getEditRoute(), ['id' => $jo_id]); $rows[$key]['meta']['onestep_edit_url'] = $this->generateUrl('jo_onestep_edit_form', ['id' => $jo_id]); } else { - $rows[$key]['meta']['update_url'] = $this->generateUrl($tier_params['edit_route'], ['id' => $jo_id]); + // $rows[$key]['meta']['update_url'] = $this->generateUrl($tier_params['edit_route'], ['id' => $jo_id]); + $rows[$key]['meta']['update_url'] = $this->generateUrl($jo_handler->getEditRoute(), ['id' => $jo_id]); $rows[$key]['meta']['onestep_edit_url'] = $this->generateUrl('jo_onestep_edit_form', ['id' => $jo_id]); $rows[$key]['meta']['pdf_url'] = $this->generateUrl('jo_pdf_form', ['id' => $jo_id]); } diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php index 36062f7e..7e4c9bb6 100644 --- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php +++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php @@ -2984,4 +2984,9 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface ->setParameter('status', $status); } } + + public function getEditRoute() + { + return 'jo_onestep_edit_form'; + } } diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php index c6a6fa01..12995e56 100644 --- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php +++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php @@ -2587,4 +2587,8 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface ->setParameter('status', $status); } } + + public function getEditRoute() + { + } }