From 9971679a00c52482302cc8e55f6663df93d06258 Mon Sep 17 00:00:00 2001 From: Brian Shaughnessy Date: Tue, 5 Dec 2017 15:27:47 -0500 Subject: [PATCH] CRM-21523 add form rule for repetition fields in scheduled reminder form --- CRM/Admin/Form/ScheduleReminders.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CRM/Admin/Form/ScheduleReminders.php b/CRM/Admin/Form/ScheduleReminders.php index 9e47d4b404e4..a360acc5e87c 100644 --- a/CRM/Admin/Form/ScheduleReminders.php +++ b/CRM/Admin/Form/ScheduleReminders.php @@ -350,6 +350,13 @@ public static function formRule($fields, $files, $self) { $errors[$recipientKind[$fields['recipient']]['target_id']] = ts('If "Also include" or "Limit to" are selected, you must specify at least one %1', array(1 => $recipientKind[$fields['recipient']]['name'])); } + //CRM-21523 + if (!empty($fields['is_repeat']) && + (empty($fields['repetition_frequency_interval']) || ($fields['end_frequency_interval'] == NULL)) + ) { + $errors['is_repeat'] = ts('If you are enabling repetition you must indicate the frequency and ending term.'); + } + $actionSchedule = $self->parseActionSchedule($fields); if ($actionSchedule->mapping_id) { $mapping = CRM_Core_BAO_ActionSchedule::getMapping($actionSchedule->mapping_id);