From e7712eae36db2dc18461175ae8a0c3102ea7a31a Mon Sep 17 00:00:00 2001
From: Tim Otten <totten@civicrm.org>
Date: Sat, 29 Aug 2015 15:05:13 -0700
Subject: [PATCH] CRM-13422 - ActionMapping - Remove gratuitous
 `entity_recipient`

This just functions an alternate-key for `entity`. It's only used
internally by the legacy `Mapping` class and does not appear in
the public interface.
---
 CRM/Activity/ActionMapping.php  |  1 -
 CRM/Event/ActionMapping.php     |  3 ---
 Civi/ActionSchedule/Mapping.php | 14 +++-----------
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/CRM/Activity/ActionMapping.php b/CRM/Activity/ActionMapping.php
index 3ebe0c4da0..e1371d1528 100644
--- a/CRM/Activity/ActionMapping.php
+++ b/CRM/Activity/ActionMapping.php
@@ -60,7 +60,6 @@ class CRM_Activity_ActionMapping extends \Civi\ActionSchedule\Mapping {
       'entity_status' => 'activity_status',
       'entity_status_label' => ts('Activity Status'),
       'entity_date_start' => 'activity_date_time',
-      'entity_recipient' => 'activity_contacts',
     )));
   }
 
diff --git a/CRM/Event/ActionMapping.php b/CRM/Event/ActionMapping.php
index e04845709f..5a0fe9f42d 100644
--- a/CRM/Event/ActionMapping.php
+++ b/CRM/Event/ActionMapping.php
@@ -63,7 +63,6 @@ class CRM_Event_ActionMapping extends \Civi\ActionSchedule\Mapping {
       'entity_status_label' => ts('Participant Status'),
       'entity_date_start' => 'event_start_date',
       'entity_date_end' => 'event_end_date',
-      'entity_recipient' => 'event_contacts',
     )));
     $registrations->register(CRM_Event_ActionMapping::create(array(
       'id' => CRM_Event_ActionMapping::EVENT_NAME_MAPPING_ID,
@@ -75,7 +74,6 @@ class CRM_Event_ActionMapping extends \Civi\ActionSchedule\Mapping {
       'entity_status_label' => ts('Participant Status'),
       'entity_date_start' => 'event_start_date',
       'entity_date_end' => 'event_end_date',
-      'entity_recipient' => 'event_contacts',
     )));
     $registrations->register(CRM_Event_ActionMapping::create(array(
       'id' => CRM_Event_ActionMapping::EVENT_TPL_MAPPING_ID,
@@ -87,7 +85,6 @@ class CRM_Event_ActionMapping extends \Civi\ActionSchedule\Mapping {
       'entity_status_label' => ts('Participant Status'),
       'entity_date_start' => 'event_start_date',
       'entity_date_end' => 'event_end_date',
-      'entity_recipient' => 'event_contacts',
     )));
   }
 
diff --git a/Civi/ActionSchedule/Mapping.php b/Civi/ActionSchedule/Mapping.php
index 0d4377bbb8..13f4888e67 100644
--- a/Civi/ActionSchedule/Mapping.php
+++ b/Civi/ActionSchedule/Mapping.php
@@ -73,7 +73,6 @@ abstract class Mapping implements MappingInterface {
     'entity_status_label',
     'entity_date_start',
     'entity_date_end',
-    'entity_recipient',
   );
 
   public static function create($params) {
@@ -150,13 +149,6 @@ abstract class Mapping implements MappingInterface {
    */
   private $entity_date_end;
 
-  /**
-   * Contact selector -- The field/relationship/option-group name.
-   * @var string|NULL
-   *   Ex: 'activity_contacts', 'event_contacts'.
-   */
-  protected $entity_recipient;
-
   /**
    * @return mixed
    */
@@ -280,12 +272,12 @@ abstract class Mapping implements MappingInterface {
    */
   public function getRecipientTypes($noThanksJustKidding = FALSE) {
     $entityRecipientLabels = array();
-    switch ($this->entity_recipient) {
-      case 'activity_contacts':
+    switch ($this->entity) {
+      case 'civicrm_activity':
         $entityRecipientLabels = \CRM_Core_OptionGroup::values('activity_contacts');
         break;
 
-      case 'event_contacts':
+      case 'civicrm_participant':
         if (!$noThanksJustKidding) {
           $entityRecipientLabels = \CRM_Core_OptionGroup::values('event_contacts', FALSE, FALSE, FALSE, NULL, 'label', TRUE, FALSE, 'name');
         }
-- 
2.25.1