rgutierrez/resq
1
0
Fork 0
Code Issues 126 Pull requests 49 Projects Releases 4 Packages Wiki Activity Actions

Resolve "Final CMB Fixes" #1229

Merged
korina.cordero merged 102 commits from 270-final-cmb-fixes into master 2020-04-03 02:54:29 +00:00
Conversation 2 Commits 102 Files changed 45 +13 -2
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1a0fb13268 - Show all commits

6
src/Controller/JobOrderController.php
View file

@ -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_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']['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]); $rows[$key]['meta']['onestep_edit_url'] = $this->generateUrl('jo_onestep_edit_form', ['id' => $jo_id]);
} }
else 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']['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]); $rows[$key]['meta']['pdf_url'] = $this->generateUrl('jo_pdf_form', ['id' => $jo_id]);
} }

5
src/Service/JobOrderHandler/CMBJobOrderHandler.php
View file

@ -2984,4 +2984,9 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
->setParameter('status', $status); ->setParameter('status', $status);
} }
} }
public function getEditRoute()
{
return 'jo_onestep_edit_form';
}
} }

4
src/Service/JobOrderHandler/ResqJobOrderHandler.php
View file

@ -2587,4 +2587,8 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
->setParameter('status', $status); ->setParameter('status', $status);
} }
} }
public function getEditRoute()
{
}
} }