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

Resolve "Transition branch for CMB and Resq merging" #1181

Merged
korina.cordero merged 258 commits from 329-transition-branch-for-cmb-and-resq-merging into master 2020-04-03 02:49:26 +00:00
Conversation 18 Commits 258 Files changed 143 +2 -3
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit cb5fa96307 - Show all commits

5
src/Controller/JobOrderController.php
View file

@ -848,8 +848,6 @@ class JobOrderController extends Controller
$params['map_js_file'] = $gis->getJSJOFile();
$params['vmfgs'] = $em->getRepository(VehicleManufacturer::class)->findAll();
$params['vmakes'] = $em->getRepository(Vehicle::class)->findAll();
$params['vmodel_year'] = '';
$params['vplate'] = '';
$template = $params['template'];
@ -886,7 +884,7 @@ class JobOrderController extends Controller
/**
* @Menu(selected="jo_onestep_edit_form")
*/
public function oneStepEditForm($id, JobOrderHandlerInterface $jo_handler,
public function oneStepEditForm($id, EntityManagerInterface $em, JobOrderHandlerInterface $jo_handler,
GISManagerInterface $gis, MapTools $map_tools)
{
$this->denyAccessUnlessGranted('jo_onestep.edit', null, 'No access.');
@ -896,6 +894,7 @@ class JobOrderController extends Controller
$params['return_url'] = $this->generateUrl('jo_open');
$params['map_js_file'] = $gis->getJSJOFile();
$params['vmfgs'] = $em->getRepository(VehicleManufacturer::class)->findAll();
$params['vmakes'] = $em->getRepository(Vehicle::class)->findAll();
$template = $params['template'];