From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 9 Jan 2014 20:26:35 +0000 (-0800)
Subject: CRM-13863 - Cleanup note comment ajax
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e69d1a1e6aa6e4d28b800a3f839f1fd571dcce62;p=civicrm-core.git

CRM-13863 - Cleanup note comment ajax
---

diff --git a/CRM/Contact/Page/View/Note.php b/CRM/Contact/Page/View/Note.php
index 1757db6cbe..3bc1b747ce 100644
--- a/CRM/Contact/Page/View/Note.php
+++ b/CRM/Contact/Page/View/Note.php
@@ -301,7 +301,6 @@ class CRM_Contact_Page_View_Note extends CRM_Core_Page {
    */
   static function &commentLinks() {
     if (!(self::$_commentLinks)) {
-      $deleteExtra = ts('Are you sure you want to delete this comment?');
       self::$_commentLinks = array(
         CRM_Core_Action::VIEW => array(
           'name' => ts('View'),
@@ -319,7 +318,6 @@ class CRM_Contact_Page_View_Note extends CRM_Core_Page {
           'name' => ts('Delete'),
           'url' => 'civicrm/contact/view/note',
           'qs' => 'action=delete&reset=1&cid=%%cid%%&id={id}&selectedChild=note',
-          'extra' => 'onclick = "if (confirm(\'' . $deleteExtra . '\') ) this.href+=\'&amp;confirmed=1\'; else return false;"',
           'title' => ts('Delete Comment'),
         ),
       );
diff --git a/templates/CRM/Contact/Page/View/Note.tpl b/templates/CRM/Contact/Page/View/Note.tpl
index d34a4cfc36..61e9d35078 100644
--- a/templates/CRM/Contact/Page/View/Note.tpl
+++ b/templates/CRM/Contact/Page/View/Note.tpl
@@ -178,6 +178,7 @@
                         + response['values'][i].modified_date
                         + '</td><td>'
                         + '<a href="'+ urlTemplate + response['values'][i].createdById +'">'+ response['values'][i].createdBy +'</a>'
+                        + '</td><td>' // FIXME: attachments
                         + '</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;