CC-3837: Calendar -> Add Show: Show's duration check does actually allow to create less than 25 hours' show.

-fixed
This commit is contained in:
denise 2012-06-08 11:39:04 -04:00
parent 76c598c05b
commit b586d69d09
1 changed files with 16 additions and 11 deletions

View File

@ -117,7 +117,8 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
} }
$pattern = '/([0-9][0-9])h ([0-9][0-9])m/'; $pattern = '/([0-9][0-9])h ([0-9][0-9])m/';
preg_match($pattern, $formData['add_show_duration'], $matches);
if (preg_match($pattern, $formData['add_show_duration'], $matches) && count($matches) == 3) {
$hours = $matches[1]; $hours = $matches[1];
$minutes = $matches[2]; $minutes = $matches[2];
if( $formData["add_show_duration"] == "00h 00m" ) { if( $formData["add_show_duration"] == "00h 00m" ) {
@ -132,6 +133,10 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
$this->getElement('add_show_duration')->setErrors(array('Cannot have duration < 0m')); $this->getElement('add_show_duration')->setErrors(array('Cannot have duration < 0m'));
$valid = false; $valid = false;
} }
}
else {
$valid = false;
}
return $valid; return $valid;
} }