Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CC-2116 : Add Extra Form Validation For Rebroadcasts 

adding check for time fields since zend passes 09:0f
setting min date on rebroadcast date picker to be start date of show.
This commit is contained in:
naomiaro 2011-04-01 19:43:57 -04:00
parent 8f8bd68849
commit b59e7aef32
4 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
application/forms/AddShowAbsoluteRebroadcastDates.php
View File

@ -36,8 +36,8 @@ class Application_Form_AddShowAbsoluteRebroadcastDates extends Zend_Form_SubForm
'value' => '', 'value' => '',
'filters' => array('StringTrim'), 'filters' => array('StringTrim'),
'validators' => array( 'validators' => array(
'NotEmpty', array('date', false, array('HH:mm')),
array('date', false, array('HH:mm')) array('regex', false, array('/^[0-9:]+$/', 'messages' => 'Invalid character entered'))
), ),
'decorators' => array( 'decorators' => array(
'ViewHelper' 'ViewHelper'
@ -69,8 +69,8 @@ class Application_Form_AddShowAbsoluteRebroadcastDates extends Zend_Form_SubForm
'value' => '', 'value' => '',
'filters' => array('StringTrim'), 'filters' => array('StringTrim'),
'validators' => array( 'validators' => array(
'NotEmpty', array('date', false, array('HH:mm')),
array('date', false, array('HH:mm')) array('regex', false, array('/^[0-9:]+$/', 'messages' => 'Invalid character entered'))
), ),
'decorators' => array( 'decorators' => array(
'ViewHelper' 'ViewHelper'
@ -102,8 +102,8 @@ class Application_Form_AddShowAbsoluteRebroadcastDates extends Zend_Form_SubForm
'value' => '', 'value' => '',
'filters' => array('StringTrim'), 'filters' => array('StringTrim'),
'validators' => array( 'validators' => array(
'NotEmpty', array('date', false, array('HH:mm')),
array('date', false, array('HH:mm')) array('regex', false, array('/^[0-9:]+$/', 'messages' => 'Invalid character entered'))
), ),
'decorators' => array( 'decorators' => array(
'ViewHelper' 'ViewHelper'
@ -135,8 +135,8 @@ class Application_Form_AddShowAbsoluteRebroadcastDates extends Zend_Form_SubForm
'value' => '', 'value' => '',
'filters' => array('StringTrim'), 'filters' => array('StringTrim'),
'validators' => array( 'validators' => array(
'NotEmpty', array('date', false, array('HH:mm')),
array('date', false, array('HH:mm')) array('regex', false, array('/^[0-9:]+$/', 'messages' => 'Invalid character entered'))
), ),
'decorators' => array( 'decorators' => array(
'ViewHelper' 'ViewHelper'
@ -168,8 +168,8 @@ class Application_Form_AddShowAbsoluteRebroadcastDates extends Zend_Form_SubForm
'value' => '', 'value' => '',
'filters' => array('StringTrim'), 'filters' => array('StringTrim'),
'validators' => array( 'validators' => array(
'NotEmpty', array('date', false, array('HH:mm')),
array('date', false, array('HH:mm')) array('regex', false, array('/^[0-9:]+$/', 'messages' => 'Invalid character entered'))
), ),
'decorators' => array( 'decorators' => array(
'ViewHelper' 'ViewHelper'

20
application/forms/AddShowRebroadcastDates.php
View File

@ -33,8 +33,8 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm
'value' => '', 'value' => '',
'filters' => array('StringTrim'), 'filters' => array('StringTrim'),
'validators' => array( 'validators' => array(
'NotEmpty', array('date', false, array('HH:mm')),
array('date', false, array('HH:mm')) array('regex', false, array('/^[0-9:]+$/', 'messages' => 'Invalid character entered'))
), ),
'decorators' => array( 'decorators' => array(
'ViewHelper' 'ViewHelper'
@ -58,8 +58,8 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm
'value' => '', 'value' => '',
'filters' => array('StringTrim'), 'filters' => array('StringTrim'),
'validators' => array( 'validators' => array(
'NotEmpty', array('date', false, array('HH:mm')),
array('date', false, array('HH:mm')) array('regex', false, array('/^[0-9:]+$/', 'messages' => 'Invalid character entered'))
), ),
'decorators' => array( 'decorators' => array(
'ViewHelper' 'ViewHelper'
@ -83,8 +83,8 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm
'value' => '', 'value' => '',
'filters' => array('StringTrim'), 'filters' => array('StringTrim'),
'validators' => array( 'validators' => array(
'NotEmpty', array('date', false, array('HH:mm')),
array('date', false, array('HH:mm')) array('regex', false, array('/^[0-9:]+$/', 'messages' => 'Invalid character entered'))
), ),
'decorators' => array( 'decorators' => array(
'ViewHelper' 'ViewHelper'
@ -108,8 +108,8 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm
'value' => '', 'value' => '',
'filters' => array('StringTrim'), 'filters' => array('StringTrim'),
'validators' => array( 'validators' => array(
'NotEmpty', array('date', false, array('HH:mm')),
array('date', false, array('HH:mm')) array('regex', false, array('/^[0-9:]+$/', 'messages' => 'Invalid character entered'))
), ),
'decorators' => array( 'decorators' => array(
'ViewHelper' 'ViewHelper'
@ -133,8 +133,8 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm
'value' => '', 'value' => '',
'filters' => array('StringTrim'), 'filters' => array('StringTrim'),
'validators' => array( 'validators' => array(
'NotEmpty', array('date', false, array('HH:mm')),
array('date', false, array('HH:mm')) array('regex', false, array('/^[0-9:]+$/', 'messages' => 'Invalid character entered'))
), ),
'decorators' => array( 'decorators' => array(
'ViewHelper' 'ViewHelper'

3
application/forms/AddShowWhen.php
View File

@ -31,7 +31,8 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
'filters' => array('StringTrim'), 'filters' => array('StringTrim'),
'validators' => array( 'validators' => array(
'NotEmpty', 'NotEmpty',
array('date', false, array('HH:mm')) array('date', false, array('HH:mm')),
array('regex', false, array('/^[0-9:]+$/', 'messages' => 'Invalid character entered'))
) )
)); ));

3
public/js/airtime/schedule/add-show.js
View File

@ -12,6 +12,7 @@ function startDpSelect(dateText, inst) {
date = new Date(time[0], time[1] - 1, time[2]); date = new Date(time[0], time[1] - 1, time[2]);
$("#add_show_end_date").datepicker("option", "minDate", date); $("#add_show_end_date").datepicker("option", "minDate", date);
$('input[name^="add_show_rebroadcast_absolute_date"]').datepicker("option", "minDate", date);
} }
function endDpSelect(dateText, inst) { function endDpSelect(dateText, inst) {
@ -144,7 +145,7 @@ function setAddShowEvents() {
}); });
form.find('input[name^="add_show_rebroadcast_absolute_date"]').datepicker({ form.find('input[name^="add_show_rebroadcast_absolute_date"]').datepicker({
//minDate: new Date(), minDate: new Date(),
dateFormat: 'yy-mm-dd' dateFormat: 'yy-mm-dd'
}); });
form.find('input[name^="add_show_rebroadcast_absolute_time"], input[name^="add_show_rebroadcast_time"]').timepicker({ form.find('input[name^="add_show_rebroadcast_absolute_time"], input[name^="add_show_rebroadcast_time"]').timepicker({