From a801aa5c52e2aa13c2866aea3470b9366a7e6a5b Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Sat, 29 Mar 2014 10:59:47 -0400
Subject: [PATCH] CRM-14327 - Cleanup custom delete links

---
 .../Page/MultipleRecordFieldsListing.php      | 11 ++--
 .../CRM/Contact/Page/View/CustomData.tpl      | 52 ++++++-------------
 .../Page/MultipleRecordFieldsListing.tpl      |  2 +-
 3 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/CRM/Profile/Page/MultipleRecordFieldsListing.php b/CRM/Profile/Page/MultipleRecordFieldsListing.php
index 2631801728..139a837f19 100644
--- a/CRM/Profile/Page/MultipleRecordFieldsListing.php
+++ b/CRM/Profile/Page/MultipleRecordFieldsListing.php
@@ -317,10 +317,15 @@ class CRM_Profile_Page_MultipleRecordFieldsListing extends CRM_Core_Page_Basic {
                 $actionParams['newCgCount'] = $newCgCount;
 
                 // DELETE action links
-                $redirectUrl = CRM_Core_Session::singleton()->readUserContext();
+                $deleteData = array(
+                  'valueID' => $recId,
+                  'groupID' => $this->_customGroupId,
+                  'contactId' => $this->_contactId,
+                  'key' => CRM_Core_Key::get('civicrm/ajax/customvalue'),
+                );
                 $links[CRM_Core_Action::DELETE]['url'] = '#';
-                $links[CRM_Core_Action::DELETE]['extra'] = " onclick=' var ru = \"{$redirectUrl}\"; showDeleteInDialog({$recId}, {$this->_customGroupId}, {$this->_contactId}, ru)' ";
-                $links[CRM_Core_Action::DELETE]['class'] = 'ignore-jshref';
+                $links[CRM_Core_Action::DELETE]['extra'] = ' data-delete_params="'. htmlspecialchars(json_encode($deleteData)) .'"';
+                $links[CRM_Core_Action::DELETE]['class'] = 'delete-custom-row';
               }
               if (!empty($pageCheckSum)) {
                 $actionParams['cs'] = $pageCheckSum;
diff --git a/templates/CRM/Contact/Page/View/CustomData.tpl b/templates/CRM/Contact/Page/View/CustomData.tpl
index 7de9712ee7..345a656d45 100644
--- a/templates/CRM/Contact/Page/View/CustomData.tpl
+++ b/templates/CRM/Contact/Page/View/CustomData.tpl
@@ -31,41 +31,23 @@
   {include file='CRM/Profile/Page/MultipleRecordFieldsListing.tpl' showListing=1 dontShowTitle=1 pageViewType='customDataView'}
   {literal}
   <script type="text/javascript">
-    function showDeleteInDialog(valueID, groupID, contactID, redirectUrl) {
-      var confirmText = '{/literal}{ts escape='js'}Are you sure you want to delete this record?{/ts}{literal}';
-      cj('#browseValues').after("<div id='delete-record'></div>");
-        cj('#delete-record').html(confirmText).dialog({
-          title: "{/literal}{ts escape='js'}Delete Record{/ts}{literal}",
-          modal: true,
-          width: 680,
-          overlay: {
-            opacity: 0.5,
-            background: "black"
-          },
-
-          buttons: {
-          {/literal}"{ts escape='js'}Cancel{/ts}"{literal}: function() {
-            cj(this).dialog("close");
-            cj('#delete-record').html('');
-          },
-          {/literal}"{ts escape='js'}OK{/ts}{literal}": function() {
-            deleteCustomValueRec(valueID, groupID, contactID, redirectUrl);
-          }
-        }
-        });
-    }
-
-    function deleteCustomValueRec(valueID, groupID, contactID, redirectUrl) {
-      var postUrl = {/literal}"{crmURL p='civicrm/ajax/customvalue' h=0 }"{literal};
-      cj.ajax({
-        type: "POST",
-        data: "valueID=" + valueID + "&groupID=" + groupID + "&contactId=" + contactID + "&key={/literal}{crmKey name='civicrm/ajax/customvalue'}{literal}",
-        url: postUrl,
-        success: function (html) {
-          window.location.href = redirectUrl;
-        }
+    CRM.$(function($) {
+      var $table = $("#{/literal}custom-{$customGroupId}-table-wrapper{literal}");
+      $('a.delete-custom-row', $table).on('click', function(e) {
+        var $el = $(this);
+        CRM.confirm({
+          message: '{/literal}{ts escape='js'}Are you sure you want to delete this record?{/ts}{literal}'
+        }).on('crmConfirm:yes', function() {
+          var postUrl = {/literal}"{crmURL p='civicrm/ajax/customvalue' h=0 }"{literal};
+          var request = $.post(postUrl, $el.data('delete_params'));
+          CRM.status({/literal}"{ts escape='js'}Record Deleted{/ts}"{literal}, request);
+          request.done(function() {
+            $table.closest('.crm-ajax-container, #crm-main-content-wrapper').crmSnippet().crmSnippet('refresh');
+          });
+        })
+        e.preventDefault();
       });
-    }
+    });
   </script>
   {/literal}
 {else}
@@ -93,4 +75,4 @@
     on_load_init_blocks(showBlocks, hideBlocks);
   </script>
 {/if}
-{/if}
\ No newline at end of file
+{/if}
diff --git a/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl b/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl
index d3805b5cd8..70805bf7b5 100644
--- a/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl
+++ b/templates/CRM/Profile/Page/MultipleRecordFieldsListing.tpl
@@ -32,7 +32,7 @@
   {/if}
   {if $records and $headers}
     {include file="CRM/common/jsortable.tpl"}
-    <div id="browseValues">
+    <div id="custom-{$customGroupId}-table-wrapper">
       <div>
         {strip}
           <table id="records" class="display">
-- 
2.25.1