From d8786c7187e732353b7d259a5de4658f8a680e21 Mon Sep 17 00:00:00 2001
From: unknown <priyanka.karan26@gmail.com>
Date: Fri, 31 Oct 2014 13:51:43 +0000
Subject: [PATCH] Added recurring activites label

---
 CRM/Activity/Selector/Search.php         | 11 +++++++++++
 CRM/Event/Page/ManageEvent.php           | 10 +++++-----
 templates/CRM/Activity/Form/Selector.tpl |  8 +++++++-
 xml/schema/Core/RecurringEntity.xml      |  2 +-
 4 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/CRM/Activity/Selector/Search.php b/CRM/Activity/Selector/Search.php
index 0bd140e84d..4565a396a8 100644
--- a/CRM/Activity/Selector/Search.php
+++ b/CRM/Activity/Selector/Search.php
@@ -344,6 +344,17 @@ class CRM_Activity_Selector_Search extends CRM_Core_Selector_Base implements CRM
         );
       }
 
+      //Check if recurring activity
+      $isRecurringActivity = CRM_Core_BAO_RecurringEntity::getParentFor($row['activity_id'], 'civicrm_activity');
+      $row['repeat'] = '';
+      if ($isRecurringActivity) {
+        if ($row['activity_id'] == $isRecurringActivity) {
+          $row['repeat'] = 'Recurring Activity - (Parent)';
+        }
+        else {
+          $row['repeat'] = 'Recurring Activity - (Child)';
+        }
+      }
       $rows[] = $row;
     }
 
diff --git a/CRM/Event/Page/ManageEvent.php b/CRM/Event/Page/ManageEvent.php
index 7461f36700..d72947a04b 100644
--- a/CRM/Event/Page/ManageEvent.php
+++ b/CRM/Event/Page/ManageEvent.php
@@ -317,14 +317,14 @@ ORDER BY start_date desc
     while ($dao->fetch()) {
       if (in_array($dao->id, $permissions[CRM_Core_Permission::VIEW])) {
         $manageEvent[$dao->id] = array();
-        $isRepeatingEvent = CRM_Core_BAO_RecurringEntity::getParentFor($dao->id, 'civicrm_event');
+        $isRecurringEvent = CRM_Core_BAO_RecurringEntity::getParentFor($dao->id, 'civicrm_event');
         $manageEvent[$dao->id]['repeat'] = '';
-        if ($isRepeatingEvent) {
-          if ($dao->id == $isRepeatingEvent) {
-            $manageEvent[$dao->id]['repeat'] = 'Repeating Event - (Parent)';
+        if ($isRecurringEvent) {
+          if ($dao->id == $isRecurringEvent) {
+            $manageEvent[$dao->id]['repeat'] = 'Recurring Event - (Parent)';
           }
           else {
-            $manageEvent[$dao->id]['repeat'] = 'Repeating Event - (Child)';
+            $manageEvent[$dao->id]['repeat'] = 'Recurring Event - (Child)';
           }
         }
         CRM_Core_DAO::storeValues($dao, $manageEvent[$dao->id]);
diff --git a/templates/CRM/Activity/Form/Selector.tpl b/templates/CRM/Activity/Form/Selector.tpl
index a9ae7f1225..24184e788a 100644
--- a/templates/CRM/Activity/Form/Selector.tpl
+++ b/templates/CRM/Activity/Form/Selector.tpl
@@ -58,7 +58,13 @@
 
     {/if}
 
-    <td>{$row.activity_type}</td>
+    <td>
+      {$row.activity_type}
+      {if $row.repeat}
+        <br/>
+        <span><b>{$row.repeat}</b></span>
+      {/if}
+    </td>
 
   <td>{$row.activity_subject}</td>
 
diff --git a/xml/schema/Core/RecurringEntity.xml b/xml/schema/Core/RecurringEntity.xml
index 85ade12b28..f90c5e4092 100644
--- a/xml/schema/Core/RecurringEntity.xml
+++ b/xml/schema/Core/RecurringEntity.xml
@@ -11,7 +11,7 @@
       <title>ID</title>
       <type>int unsigned</type>
       <length>10</length>
-      <required>true</required>      
+      <required>true</required>
       <add>4.6</add>
   </field>
   <primaryKey>
-- 
2.25.1