tonyair/silverstripe-userforms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-userforms.git synced 2024-10-22 17:05:42 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #36 from tractorcow/pulls/fix-empty-pages

Browse Source 
BUG Fix empty pages
This commit is contained in:
David Craig 2015-08-17 16:40:38 +12:00
commit ab79e5cd11
4 changed files with 46 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
code/formfields/UserFormsFieldList.php
View File

@ -29,4 +29,15 @@ class UserFormsFieldList extends FieldList implements UserFormsFieldContainer {
return $this; return $this;
} }
/**
* Remove all empty steps
*/
public function clearEmptySteps() {
foreach($this as $field) {
if($field instanceof UserFormsStepField && count($field->getChildren()) === 0) {
$this->remove($field);
}
}
}
} }

1
code/forms/UserForm.php
View File

@ -83,6 +83,7 @@ class UserForm extends Form {
foreach ($this->controller->Fields() as $field) { foreach ($this->controller->Fields() as $field) {
$target = $target->processNext($field); $target = $target->processNext($field);
} }
$fields->clearEmptySteps();
$this->extend('updateFormFields', $fields); $this->extend('updateFormFields', $fields);
return $fields; return $fields;
} }

16
tests/UserDefinedFormTest.yml
View File

@ -7,6 +7,12 @@ EditableFormStep:
Title: 'Step 1' Title: 'Step 1'
form5step1: form5step1:
Title: 'Step 1' Title: 'Step 1'
form6step1:
Title: 'Step 1'
form6step2:
Title: 'Step 2'
form6step3:
Title: 'Step 2'
EditableOption: EditableOption:
option-1: option-1:
@ -84,6 +90,12 @@ EditableTextField:
CustomErrorMessage: Custom Error Message CustomErrorMessage: Custom Error Message
Required: true Required: true
field-1:
Name: Field1
field-2:
Name: Field2
EditableDropdown: EditableDropdown:
basic-dropdown: basic-dropdown:
Name: basic-dropdown Name: basic-dropdown
@ -215,3 +227,7 @@ UserDefinedForm:
Title: 'Page with filtered recipients' Title: 'Page with filtered recipients'
Fields: =>EditableFormStep.form5step1,=>EditableCheckboxGroupField.checkbox-group, =>EditableTextField.your-name-field, =>EditableTextField.street-field, =>EditableTextField.city-field Fields: =>EditableFormStep.form5step1,=>EditableCheckboxGroupField.checkbox-group, =>EditableTextField.your-name-field, =>EditableTextField.street-field, =>EditableTextField.city-field
EmailRecipients: =>UserDefinedForm_EmailRecipient.unfiltered-recipient-1, =>UserDefinedForm_EmailRecipient.filtered-recipient-1, =>UserDefinedForm_EmailRecipient.filtered-recipient-2 EmailRecipients: =>UserDefinedForm_EmailRecipient.unfiltered-recipient-1, =>UserDefinedForm_EmailRecipient.filtered-recipient-1, =>UserDefinedForm_EmailRecipient.filtered-recipient-2
empty-page:
Title: 'Page with empty step'
Fields: =>EditableFormStep.form6step1, =>EditableTextField.field-1, =>EditableFormStep.form6step2, =>EditableTextField.field-2, =>EditableFormStep.form6step3

18
tests/UserFormTest.php Normal file
View File

@ -0,0 +1,18 @@
<?php
class UserFormTest extends SapphireTest {
protected static $fixture_file = 'UserDefinedFormTest.yml';
/**
* Tests that a form will not generate empty pages
*/
public function testEmptyPages() {
$page = $this->objFromFixture('UserDefinedForm', 'empty-page');
$this->assertEquals(5, $page->Fields()->count());
$controller = ModelAsController::controller_for($page);
$form = new UserForm($controller);
$this->assertEquals(2, $form->getSteps()->count());
}
}