Add check if current step doesn't exist and no session current step then get the current step

This commit is contained in:
Lauren Hodgson 2019-11-29 12:14:46 +13:00
parent a57bfe74bb
commit 2574126d1f

View File

@ -229,14 +229,14 @@ abstract class MultiForm extends Form
$currentStep = null; $currentStep = null;
$StepID = $this->controller->getRequest()->getVar('StepID'); $StepID = $this->controller->getRequest()->getVar('StepID');
if (isset($StepID)) { if (isset($StepID)) {
$currentStep = DataObject::get_one( $currentStep = MultiFormStep::get()->filter([
MultiFormStep::class, 'SessionID' => $this->session->ID,
[ 'ID' => $StepID
'SessionID' => $this->session->ID, ])->first();
'ID' => $StepID }
]
); // if current step doesn't exist and no session current step then get the current step
} elseif ($this->session->CurrentStepID) { if (!$currentStep && $this->session->CurrentStepID) {
$currentStep = $this->session->CurrentStep(); $currentStep = $this->session->CurrentStep();
} }