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
3 changed files with 7 additions and 1 deletions
Showing only changes of commit a0f7ca6abe - Show all commits

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);
if (empty($jo))

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)) {
// get current user
$user = $this->security->getUser();

View file

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