From 5c97b65f291ddf027b1279c5aeef111b4d5f7722 Mon Sep 17 00:00:00 2001
From: deepak-srivastava <deepak.srivastava.0303@gmail.com>
Date: Wed, 4 Feb 2015 12:03:25 +0000
Subject: [PATCH] fix for repetition_start_date_display not being set due to
 change in date widget input id pattern > parent and child activity with same
 dates

---
 CRM/Core/Form/RecurringEntity.php        | 2 +-
 templates/CRM/Activity/Form/Activity.tpl | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CRM/Core/Form/RecurringEntity.php b/CRM/Core/Form/RecurringEntity.php
index 8dbed40139..b2798ef9c2 100644
--- a/CRM/Core/Form/RecurringEntity.php
+++ b/CRM/Core/Form/RecurringEntity.php
@@ -298,7 +298,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');
             }
diff --git a/templates/CRM/Activity/Form/Activity.tpl b/templates/CRM/Activity/Form/Activity.tpl
index a48bb89f27..096e6aa537 100644
--- a/templates/CRM/Activity/Form/Activity.tpl
+++ b/templates/CRM/Activity/Form/Activity.tpl
@@ -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');
               }
             });
-- 
2.25.1