From f3ceb1120bd50a5ac830ba405b3c6f72144480cb Mon Sep 17 00:00:00 2001 From: Alok Patel Date: Thu, 7 Dec 2017 18:15:16 +0530 Subject: [PATCH] CIVICRM-754: Displaying Activity custom fields(Files) when opening from Case Report. --- CRM/Case/XMLProcessor/Report.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CRM/Case/XMLProcessor/Report.php b/CRM/Case/XMLProcessor/Report.php index 8ece8d5599..1cc5732e07 100644 --- a/CRM/Case/XMLProcessor/Report.php +++ b/CRM/Case/XMLProcessor/Report.php @@ -558,7 +558,7 @@ WHERE a.id = %1 $value = $dao->$columnName; } else { - $value = CRM_Core_BAO_CustomField::displayValue($dao->$columnName, $typeValue['fieldID']); + $value = CRM_Core_BAO_CustomField::displayValue($dao->$columnName, $typeValue['fieldID'], $activityDAO->id); } if ($value) { @@ -572,10 +572,6 @@ WHERE a.id = %1 ) { $value = $this->redact($value); } - elseif (CRM_Utils_Array::value('type', $typeValue) == 'File') { - $tableName = CRM_Core_DAO::getFieldValue('CRM_Core_DAO_EntityFile', $typeValue, 'entity_table'); - $value = CRM_Core_BAO_File::attachmentInfo($tableName, $activityDAO->id); - } elseif (CRM_Utils_Array::value('type', $typeValue) == 'Link') { $value = CRM_Utils_System::formatWikiURL($value); } -- 2.25.1