From b59e7aef32b2afd6aab286c83f99b08cdb94c9db Mon Sep 17 00:00:00 2001 From: naomiaro Date: Fri, 1 Apr 2011 19:43:57 -0400 Subject: [PATCH] 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. --- .../forms/AddShowAbsoluteRebroadcastDates.php | 20 +++++++++---------- application/forms/AddShowRebroadcastDates.php | 20 +++++++++---------- application/forms/AddShowWhen.php | 3 ++- public/js/airtime/schedule/add-show.js | 3 ++- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/application/forms/AddShowAbsoluteRebroadcastDates.php b/application/forms/AddShowAbsoluteRebroadcastDates.php index 49824a355..7d173df2a 100644 --- a/application/forms/AddShowAbsoluteRebroadcastDates.php +++ b/application/forms/AddShowAbsoluteRebroadcastDates.php @@ -36,8 +36,8 @@ class Application_Form_AddShowAbsoluteRebroadcastDates extends Zend_Form_SubForm 'value' => '', 'filters' => array('StringTrim'), '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( 'ViewHelper' @@ -69,8 +69,8 @@ class Application_Form_AddShowAbsoluteRebroadcastDates extends Zend_Form_SubForm 'value' => '', 'filters' => array('StringTrim'), '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( 'ViewHelper' @@ -102,8 +102,8 @@ class Application_Form_AddShowAbsoluteRebroadcastDates extends Zend_Form_SubForm 'value' => '', 'filters' => array('StringTrim'), '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( 'ViewHelper' @@ -135,8 +135,8 @@ class Application_Form_AddShowAbsoluteRebroadcastDates extends Zend_Form_SubForm 'value' => '', 'filters' => array('StringTrim'), '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( 'ViewHelper' @@ -168,8 +168,8 @@ class Application_Form_AddShowAbsoluteRebroadcastDates extends Zend_Form_SubForm 'value' => '', 'filters' => array('StringTrim'), '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( 'ViewHelper' diff --git a/application/forms/AddShowRebroadcastDates.php b/application/forms/AddShowRebroadcastDates.php index e1e390e2a..6cc86b134 100644 --- a/application/forms/AddShowRebroadcastDates.php +++ b/application/forms/AddShowRebroadcastDates.php @@ -33,8 +33,8 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm 'value' => '', 'filters' => array('StringTrim'), '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( 'ViewHelper' @@ -58,8 +58,8 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm 'value' => '', 'filters' => array('StringTrim'), '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( 'ViewHelper' @@ -83,8 +83,8 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm 'value' => '', 'filters' => array('StringTrim'), '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( 'ViewHelper' @@ -108,8 +108,8 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm 'value' => '', 'filters' => array('StringTrim'), '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( 'ViewHelper' @@ -133,8 +133,8 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm 'value' => '', 'filters' => array('StringTrim'), '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( 'ViewHelper' diff --git a/application/forms/AddShowWhen.php b/application/forms/AddShowWhen.php index 295354c36..5795145dc 100644 --- a/application/forms/AddShowWhen.php +++ b/application/forms/AddShowWhen.php @@ -31,7 +31,8 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm 'filters' => array('StringTrim'), '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')) ) )); diff --git a/public/js/airtime/schedule/add-show.js b/public/js/airtime/schedule/add-show.js index 02d2847a9..d8ded66a6 100644 --- a/public/js/airtime/schedule/add-show.js +++ b/public/js/airtime/schedule/add-show.js @@ -12,6 +12,7 @@ function startDpSelect(dateText, inst) { date = new Date(time[0], time[1] - 1, time[2]); $("#add_show_end_date").datepicker("option", "minDate", date); + $('input[name^="add_show_rebroadcast_absolute_date"]').datepicker("option", "minDate", date); } function endDpSelect(dateText, inst) { @@ -144,7 +145,7 @@ function setAddShowEvents() { }); form.find('input[name^="add_show_rebroadcast_absolute_date"]').datepicker({ - //minDate: new Date(), + minDate: new Date(), dateFormat: 'yy-mm-dd' }); form.find('input[name^="add_show_rebroadcast_absolute_time"], input[name^="add_show_rebroadcast_time"]').timepicker({