CRM-15932 - Fix activity date default recurring values
authorColeman Watts <coleman@civicrm.org>
Tue, 3 Mar 2015 23:15:08 +0000 (18:15 -0500)
committerColeman Watts <coleman@civicrm.org>
Tue, 3 Mar 2015 23:15:08 +0000 (18:15 -0500)
templates/CRM/Core/Form/RecurringEntity.tpl

index 52f5a6aa88acdaa03a169ca8d04c62665d6002f3..c7b515a759f4814460383db3aa919d5dcba800e4 100644 (file)
     //If there are changes in repeat configuration, enable save button\r
     //Dialog for preview repeat Configuration dates\r
     function previewDialog() {\r
-      var payload = $form.serialize() + '&entity_table={/literal}{$entityTable}{literal}&entity_id={/literal}{$currentEntityId}{literal}',\r
+      // Set default value for start date on activity forms before generating preview\r
+      if (!$('#repetition_start_date', $form).val() && $('#activity_date_time', $form).val()) {\r
+        $('#repetition_start_date', $form)\r
+          .val($('#activity_date_time', $form).val())\r
+          .next().val($('#activity_date_time', $form).next().val())\r
+          .siblings('.hasTimeEntry').val($('#activity_date_time', $form).siblings('.hasTimeEntry').val());\r
+      }\r
+      var payload = $form.serialize() + '{/literal}&entity_table={$entityTable}&entity_id={$currentEntityId}{literal}',\r
         settings = CRM.utils.adjustDialogDefaults({\r
           width: '50%',\r
           url: CRM.url("civicrm/recurringentity/preview", payload)\r