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

Merge branch '357-transition-fix-resq-s-geteditroute' into '270-final-cmb-fixes'

Browse source 
Resolve "TRANSITION - fix resq's getEditRoute"

See merge request jankstudio/resq!400
This commit is contained in:
Kendrick Chan 2020-02-27 04:59:18 +00:00
commit 074a85a535
6 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Controller/JobOrderController.php
View file

@ -277,13 +277,13 @@ 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($jo_id), ['id' => $jo_id]); $rows[$key]['meta']['edit_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id, $tier_params['edit_route']), ['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($jo_id), ['id' => $jo_id]); $rows[$key]['meta']['update_url'] = $this->generateUrl($jo_handler->getEditRoute($jo_id, $tier_params['edit_route']), ['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]);
} }

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

@ -2997,7 +2997,7 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
} }
} }
public function getEditRoute($jo_id) public function getEditRoute($jo_id, $tier = null)
{ {
$jo = $this->em->getRepository(JobOrder::class)->find($jo_id); $jo = $this->em->getRepository(JobOrder::class)->find($jo_id);
if (empty($jo)) if (empty($jo))

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

@ -314,6 +314,9 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
} }
} }
// TODO: check status before saving since JO might already
// have a status that needs to be retained
if (empty($error_array)) { if (empty($error_array)) {
// get current user // get current user
$user = $this->security->getUser(); $user = $this->security->getUser();
@ -2588,7 +2591,11 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
} }
} }
public function getEditRoute() public function getEditRoute($jo_id, $tier)
{ {
if (empty($tier))
return 'jo_open_edit_form';
return $tier;
} }
} }

3
src/Service/JobOrderHandlerInterface.php
View file

@ -98,4 +98,7 @@ interface JobOrderHandlerInterface
// check if service type is new battery // check if service type is new battery
public function checkIfNewBattery(JobOrder $jo); public function checkIfNewBattery(JobOrder $jo);
// return the edit route, based on tier and form
public function getEditRoute(int $jo_id, $tier);
} }

2
templates/job-order/list.fulfillment.html.twig
View file

@ -135,7 +135,7 @@
sortable: false, sortable: false,
overflow: 'visible', overflow: 'visible',
template: function (row, index, datatable) { template: function (row, index, datatable) {
var actions = '<a href="' + row.meta.update_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-edit" title="View / Edit"><i class="la la-edit"></i></a>' + '<a href="' + row.meta.onestep_edit_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-edit" title="One Step Edit"><i class="la la-edit"></i></a>'; var actions = '<a href="' + row.meta.update_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-edit" title="View / Edit"><i class="la la-edit"></i></a>';
return actions; return actions;
}, },

3
templates/job-order/list.open.html.twig
View file

@ -148,9 +148,6 @@
{% if is_granted('jo_open.edit') %} {% if is_granted('jo_open.edit') %}
actions += '<a href="' + row.meta.edit_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-reassign-hub" title="Edit"><i class="fa fa-file"></i></a>'; actions += '<a href="' + row.meta.edit_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-reassign-hub" title="Edit"><i class="fa fa-file"></i></a>';
{% endif %} {% endif %}
{% if is_granted('jo_onestep.edit') %}
actions += '<a href="' + row.meta.onestep_edit_url + '" class="m-portlet__nav-link btn m-btn m-btn--hover-accent m-btn--icon m-btn--icon-only m-btn--pill btn-reassign-hub" title="One Step Edit"><i class="fa fa-file"></i></a>';
{% endif %}
return actions; return actions;
}, },