tonyair
/
silverstripe-multiform
mirror of https://github.com/silverstripe/silverstripe-multiform
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #79 from isobar-nz/fix-session-current-step 

Fix get current step
This commit is contained in:
Damian Mooyman 2019-11-29 12:29:02 +13:00 committed by GitHub
parent a57bfe74bb 2574126d1f
commit 41d8927602
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Forms/MultiForm.php
View File

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