CRM-21304 quash form reload message when refreshing (#11122)

* CRM-21304 quash form reload message when refreshing

* CRM-21304 - Disable unsaved changes warning on dedupe form

----------------------------------------
* CRM-21304: Dedupe usablity, quash refresh message in more cases
  https://issues.civicrm.org/jira/browse/CRM-21304

diff --git a/CRM/Contact/Form/Merge.php b/CRM/Contact/Form/Merge.php
index 5a8f5a77c5ebc50596db650a51bf28587e8edaca..9a567873eb0781fff037d6dfbed132dd569b7f57 100644 (file)
--- a/CRM/Contact/Form/Merge.php
+++ b/CRM/Contact/Form/Merge.php
@@ -230,6 +230,7 @@ class CRM_Contact_Form_Merge extends CRM_Core_Form {
   }
 
   public function buildQuickForm() {
+    $this->unsavedChangesWarn = FALSE;
     CRM_Utils_System::setTitle(ts('Merge %1 contacts', array(1 => $this->_contactType)));
     $buttons = array();
 

diff --git a/templates/CRM/Contact/Page/DedupeFind.tpl b/templates/CRM/Contact/Page/DedupeFind.tpl
index 082229e1ffcd9dc92bb4b2b5d6355dc674148ddb..17e2edc09d51501fb0c2411a023de11a946067b1 100644 (file)
--- a/templates/CRM/Contact/Page/DedupeFind.tpl
+++ b/templates/CRM/Contact/Page/DedupeFind.tpl
@@ -181,10 +181,6 @@
       }
     });
     $(function($) {
-      $('.button').click(function() {
-        // no unsaved changes confirmation dialogs
-        $('[data-warn-changes=true]').attr('data-warn-changes', 'false');
-      });
 
       var sourceUrl = {/literal}'{$sourceUrl}'{literal};
       var context   = {/literal}'{$context}'{literal};