now shows more than one attachment icon if comment has more than one

diff --git a/CRM/Core/BAO/Note.php b/CRM/Core/BAO/Note.php
index f4f4846728bfa79bc6b3c36fcb50e3f5d7bb825b..091afa1c0c1fa0bf58d6b49b64a9dd80668afc27 100644 (file)
--- a/CRM/Core/BAO/Note.php
+++ b/CRM/Core/BAO/Note.php
@@ -490,7 +490,7 @@ ORDER BY  modified_date desc";
 
         // paper icon view for attachments part
         $paperIconAttachmentInfo = CRM_Core_BAO_File::paperIconAttachment('civicrm_note', $note->id);
-        $tree[$note->id]['attachment'] = $paperIconAttachmentInfo;
+        $tree[$note->id]['attachment'] = implode('', $paperIconAttachmentInfo);
 
         if ($snippet) {
           $tree[$note->id]['note'] = nl2br($tree[$note->id]['note']);

diff --git a/templates/CRM/Contact/Page/View/Note.tpl b/templates/CRM/Contact/Page/View/Note.tpl
index 2f83cb3d073c6de9e578883222dd1c6d873efa19..7794b522176c91966134bfbcae143528ee0dd3e5 100644 (file)
--- a/templates/CRM/Contact/Page/View/Note.tpl
+++ b/templates/CRM/Contact/Page/View/Note.tpl
@@ -166,8 +166,6 @@
                         commentRows['cnote_'+ noteId][response['values'][i].id] ) {
                         continue;
                     }
-                    for (var j in response['values'][i].attachment) {
-                    }
                     str = '<tr id="cnote_'+ response['values'][i].id +'" class="'+ rowClassOddEven +' note-comment_'+ noteId +'">'
                         + '<td></td>'
                         + '<td style="padding-left: 2em">'
@@ -179,7 +177,7 @@
                         + '</td><td>'
                         + '<a href="'+ urlTemplate + response['values'][i].createdById +'">'+ response['values'][i].createdBy +'</a>'
                         + '</td><td>'
-                        + response['values'][i].attachment[j]
+                        + response['values'][i].attachment
                         + '</td><td>'+ commentAction.replace(/{cid}/g, response['values'][i].createdById).replace(/{id}/g, response['values'][i].id) +'</td></tr>'
 
                     commentRows['cnote_'+ noteId][response['values'][i].id] = str;