Commit bb2a1323 authored by Dave Greenberg's avatar Dave Greenberg

Merge pull request #5086 from deepak-srivastava/CRM-15490

CRM-15490 repetition_start_date_display not being set due to change in dat...
parents 725b3de6 5c97b65f
......@@ -303,7 +303,7 @@ class CRM_Core_Form_RecurringEntity {
}
if ($values['repeats_by'] == 2) {
if (CRM_Utils_Array::value('entity_status_1', $values)) {
$dayOfTheWeekNo = array(first, second, third, fourth, last);
$dayOfTheWeekNo = array('first', 'second', 'third', 'fourth', 'last');
if (!in_array($values['entity_status_1'], $dayOfTheWeekNo)) {
$errors['entity_status_1'] = ts('Invalid option');
}
......
......@@ -216,19 +216,19 @@
<script type="text/javascript">
CRM.$(function($) {
if ($('#activity_date_time').val() !== "" && $('#activity_date_time_time').val() !== "") {
$('#repetition_start_date, #repetition_start_date_display').val($('#activity_date_time').val());
$('#repetition_start_date, input[id^="repetition_start_date_display_"]').val($('#activity_date_time').val());
$('#repetition_start_date_time').val($('#activity_date_time_time').val());
}
$('#activity_date_time_display').change(function() {
$('#repetition_start_date, #repetition_start_date_display').val($('#activity_date_time').val());
$('input[id^="activity_date_time_display_"]').change(function() {
$('#repetition_start_date, input[id^="repetition_start_date_display_"]').val($('#activity_date_time').val());
});
$('#activity_date_time_time').change(function() {
$('#repetition_start_date_time').val($('#activity_date_time_time').val());
});
if ($('#start_action_offset').val() == "" && $('#repeat_absolute_date_display').val() == "") {
if ($('#start_action_offset').val() == "" && $('input[id^="repeat_absolute_date_display_"]').val() == "") {
$('#recurring-entity-block').addClass('collapsed');
}
});
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment