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 #245 from 3Dgoo/feature/custom-error-messages-fix

Browse Source 
Fixing and adding form field custom error messages code.
This commit is contained in:
Will Rossiter 2014-12-22 15:05:53 +13:00
commit 96fb8edd66
7 changed files with 68 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
code/model/formfields/EditableCheckbox.php
View File

@ -21,7 +21,18 @@ class EditableCheckbox extends EditableFormField {
}
public function getFormField() {
return new CheckboxField( $this->Name, $this->Title, $this->getSetting('Default'));
$field = CheckboxField::create( $this->Name, $this->Title, $this->getSetting('Default'));
if ($this->Required) {
// Required validation can conflict so add the Required validation messages
// as input attributes
$errorMessage = $this->getErrorMessage()->HTML();
$field->setAttribute('data-rule-required', 'true');
$field->setAttribute('data-msg-required', $errorMessage);
}
return $field;
}
public function getValueFromData($data) {

10
code/model/formfields/EditableDateField.php
View File

@ -38,9 +38,17 @@ class EditableDateField extends EditableFormField {
*/
public function getFormField() {
$defaultValue = ($this->getSetting('DefaultToToday')) ? date('Y-m-d') : $this->Default;
$field = new EditableDateField_FormField( $this->Name, $this->Title, $defaultValue);
$field = EditableDateField_FormField::create( $this->Name, $this->Title, $defaultValue);
$field->setConfig('showcalendar', true);
if ($this->Required) {
// Required validation can conflict so add the Required validation messages
// as input attributes
$errorMessage = $this->getErrorMessage()->HTML();
$field->setAttribute('data-rule-required', 'true');
$field->setAttribute('data-msg-required', $errorMessage);
}
return $field;
}
}

12
code/model/formfields/EditableDropdown.php
View File

@ -26,6 +26,16 @@ class EditableDropdown extends EditableMultipleOptionField {
}
}
return new DropdownField($this->Name, $this->Title, $options);
$field = DropdownField::create($this->Name, $this->Title, $options);
if ($this->Required) {
// Required validation can conflict so add the Required validation messages
// as input attributes
$errorMessage = $this->getErrorMessage()->HTML();
$field->setAttribute('data-rule-required', 'true');
$field->setAttribute('data-msg-required', $errorMessage);
}
return $field;
}
}

14
code/model/formfields/EditableEmailField.php
View File

@ -18,16 +18,18 @@ class EditableEmailField extends EditableFormField {
}
public function getFormField() {
$field = EmailField::create($this->Name, $this->Title);
if ($this->Required) {
// Required and Email validation can conflict so add the Required validation messages
// Required and Email validation can conflict so add the Required validation messages
// as input attributes
$errorMessage = $this->getErrorMessage()->HTML();
$field = new EmailField($this->Name, $this->Title);
$field->setAttribute('data-rule-required','true');
$field->setAttribute('data-msg-required',$errorMessage);
return $field;
$field->setAttribute('data-rule-required', 'true');
$field->setAttribute('data-msg-required', $errorMessage);
}
return new EmailField($this->Name, $this->Title);
return $field;
}
/**

10
code/model/formfields/EditableFileField.php
View File

@ -30,7 +30,7 @@ class EditableFileField extends EditableFormField {
}
public function getFormField() {
$field = new FileField($this->Name, $this->Title);
$field = FileField::create($this->Name, $this->Title);
if($this->getSetting('Folder')) {
$folder = Folder::get()->byId($this->getSetting('Folder'));
@ -42,6 +42,14 @@ class EditableFileField extends EditableFormField {
}
}
if ($this->Required) {
// Required validation can conflict so add the Required validation messages
// as input attributes
$errorMessage = $this->getErrorMessage()->HTML();
$field->setAttribute('data-rule-required', 'true');
$field->setAttribute('data-msg-required', $errorMessage);
}
return $field;
}

7
code/model/formfields/EditableNumericField.php
View File

@ -24,13 +24,12 @@ class EditableNumericField extends EditableFormField {
$field = new NumericField($this->Name, $this->Title);
$field->addExtraClass('number');
if ($field->Required) {
if ($this->Required) {
// Required and numeric validation can conflict so add the
// required validation messages as input attributes
$errorMessage = $this->getErrorMessage()->HTML();
$field->setAttribute('data-rule-required','true');
$field->setAttribute('data-msg-required',$errorMessage);
$field->setAttribute('data-rule-required', 'true');
$field->setAttribute('data-msg-required', $errorMessage);
}
return $field;

20
code/model/formfields/EditableTextField.php
View File

@ -39,14 +39,26 @@ class EditableTextField extends EditableFormField {
* @return TextareaField|TextField
*/
public function getFormField() {
$field = NULL;
if($this->getSetting('Rows') && $this->getSetting('Rows') > 1) {
$taf = new TextareaField($this->Name, $this->Title);
$taf->setRows($this->getSetting('Rows'));
return $taf;
$field = TextareaField::create($this->Name, $this->Title);
$field->setRows($this->getSetting('Rows'));
}
else {
return new TextField($this->Name, $this->Title, null, $this->getSetting('MaxLength'));
$field = TextField::create($this->Name, $this->Title, null, $this->getSetting('MaxLength'));
}
if ($this->Required) {
// Required validation can conflict so add the Required validation messages
// as input attributes
$errorMessage = $this->getErrorMessage()->HTML();
$field->setAttribute('data-rule-required', 'true');
$field->setAttribute('data-msg-required', $errorMessage);
}
return $field;
}
/**