From 9a042a42f243da32bca5f70b4366591411b94d03 Mon Sep 17 00:00:00 2001 From: leez Date: Fri, 2 May 2014 17:28:22 -0700 Subject: [PATCH] CRM-14063-added attachment icon for comments that are children of notes --- CRM/Core/BAO/Note.php | 4 ++++ templates/CRM/Contact/Page/View/Note.tpl | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CRM/Core/BAO/Note.php b/CRM/Core/BAO/Note.php index 8977d285ef..f4f4846728 100644 --- a/CRM/Core/BAO/Note.php +++ b/CRM/Core/BAO/Note.php @@ -488,6 +488,10 @@ ORDER BY modified_date desc"; $tree[$note->id]['createdById'] = $createdById; $tree[$note->id]['modified_date'] = CRM_Utils_Date::customFormat($tree[$note->id]['modified_date']); + // paper icon view for attachments part + $paperIconAttachmentInfo = CRM_Core_BAO_File::paperIconAttachment('civicrm_note', $note->id); + $tree[$note->id]['attachment'] = $paperIconAttachmentInfo; + if ($snippet) { $tree[$note->id]['note'] = nl2br($tree[$note->id]['note']); $tree[$note->id]['note'] = smarty_modifier_mb_truncate( diff --git a/templates/CRM/Contact/Page/View/Note.tpl b/templates/CRM/Contact/Page/View/Note.tpl index 28bcd9ec23..2f83cb3d07 100644 --- a/templates/CRM/Contact/Page/View/Note.tpl +++ b/templates/CRM/Contact/Page/View/Note.tpl @@ -166,6 +166,8 @@ commentRows['cnote_'+ noteId][response['values'][i].id] ) { continue; } + for (var j in response['values'][i].attachment) { + } str = '' + '' + '' @@ -176,7 +178,8 @@ + response['values'][i].modified_date + '' + ''+ response['values'][i].createdBy +'' - + '' // FIXME: attachments + + '' + + response['values'][i].attachment[j] + ''+ commentAction.replace(/{cid}/g, response['values'][i].createdById).replace(/{id}/g, response['values'][i].id) +'' commentRows['cnote_'+ noteId][response['values'][i].id] = str; -- 2.25.1