tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-28 23:49:26 +02:00
Code Issues Projects Releases Wiki Activity

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@97726 467b73ca-7a2a-4603-9d3b-597d59a354a9

Browse Source
This commit is contained in:
Normann Lou 2010-01-28 05:07:58 +00:00 committed by Sam Minnee
parent f2098eaac7
commit aa27047ed9
3 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
forms/CompositeDateField.php
View File

@ -103,26 +103,25 @@ class CompositeDateField extends DateField {
Behaviour.register({
"#$formID": {
validateCompositeDateField: function(fieldName) {
var el = _CURRENT_FORM.elements[fieldName];
if(!el || !el.value) return true;
// Creditcards are split into multiple values, so get the inputs from the form.
dateParts = $(fieldName).getElementsByTagName('select');
// Concatenate the string values from the parts of the input.
for(i=0; i < dateParts.length ; i++ ){
// The default selected value is 'NotSet'
if(dateParts[i].value == 'NotSet'){
switch(i){
case 0: err = "$day"; break;
case 1: err = "$month"; break;
case 2: err = "$year"; break;
}
validationError(dateParts[i],"$error1 '" + err + "' $error2","validation");
return false;
}
var day_value = \$F(_CURRENT_FORM.elements[fieldName+'[date]']);
var month_value = \$F(_CURRENT_FORM.elements[fieldName+'[month]']);
var year_value = \$F(_CURRENT_FORM.elements[fieldName+'[year]']);
if(day_value == 'NotSet' && month_value == 'NotSet' && year_value == 'NotSet') return true;
else if(day_value == 'NotSet') {
var err = "$day";
var el = _CURRENT_FORM.elements[fieldName+'[date]'];
} else if(month_value == 'NotSet') {
var err = "$month";
var el = _CURRENT_FORM.elements[fieldName+'[month]'];
} else if(year_value == 'NotSet') {
var err = "$year";
var el = _CURRENT_FORM.elements[fieldName+'[year]'];
} else {
return true;
}
return true;
validationError(el,"$error1 '" + err + "' $error2","validation");
return false;
}
}
});

20
forms/DMYDateField.php
View File

@ -72,21 +72,23 @@ HTML;
function jsValidation() {
$formID = $this->form->FormName();
$error = _t('DateField.VALIDATIONJS', 'Please enter a valid date format (DD/MM/YYYY).');
$error = 'Please enter a valid date format (DD/MM/YYYY) from dmy.';
$jsFunc =<<<JS
Behaviour.register({
"#$formID": {
validateDMYDate: function(fieldName) {
var value = \$F(_CURRENT_FORM.elements[fieldName+'[Day]'])
+ '/'
+ \$F(_CURRENT_FORM.elements[fieldName+'[Month]'])
+ '/'
+ \$F(_CURRENT_FORM.elements[fieldName+'[Year]'])
;
var day_value = \$F(_CURRENT_FORM.elements[fieldName+'[Day]']);
var month_value = \$F(_CURRENT_FORM.elements[fieldName+'[Month]']);
var year_value = \$F(_CURRENT_FORM.elements[fieldName+'[Year]']);
if(day_value || month_value || year_value){
var value = day_value + '/' + month_value + '/' + year_value;
if(value && value.length > 0 && !value.match(/^[0-9]{1,2}\/[0-9]{1,2}\/[0-90-9]{2,4}\$/)) {
validationError(_CURRENT_FORM.elements[fieldName+'[Day]'],"$error","validation",false);
return false;
if(value && value.length > 0 && !value.match(/^[0-9]{1,2}\/[0-9]{1,2}\/[0-90-9]{2,4}\$/)) {
validationError(_CURRENT_FORM.elements[fieldName+'[Day]'],"$error","validation",false);
return false;
}
}
return true;
}
}

2
forms/DateField.php
View File

@ -96,7 +96,7 @@ JS;
return true;
}
if(!empty ($this->value) && !preg_match('/^[0-9]{1,2}\/[0-9]{1,2}\/[0-90-9]{2,4}$/', $this->value))
if(!empty ($this->value) && is_string($this->value) && !preg_match('/^[0-9]{1,2}\/[0-9]{1,2}\/[0-90-9]{2,4}$/', $this->value))
{
$validator->validationError(
$this->name,