CRM-14353 - replacing formNavigate.tpl in-progress

----------------------------------------
* CRM-14353: Fix formNavigate to work with multiple forms & ajax
  https://issues.civicrm.org/jira/browse/CRM-14353

diff --git a/CRM/Mailing/Form/Upload.php b/CRM/Mailing/Form/Upload.php
index a563deaa0aef711a435cd6d9a0caa759bcd6b20e..fc4238d7764b84fb515685542f3bd488e9de7026 100644 (file)
--- a/CRM/Mailing/Form/Upload.php
+++ b/CRM/Mailing/Form/Upload.php
@@ -37,6 +37,9 @@
  * This file is used to build the form configuring mailing details
  */
 class CRM_Mailing_Form_Upload extends CRM_Core_Form {
+
+  protected $unsavedChangesWarn = TRUE;
+
   public $_mailingID;
 
   function preProcess() {

diff --git a/templates/CRM/Mailing/Form/Upload.tpl b/templates/CRM/Mailing/Form/Upload.tpl
index 2b932479b72ae8944f87ad5435314e9c24effbe2..29f911a7f4f83021713d03d0480e24ed7cfb68f5 100644 (file)
--- a/templates/CRM/Mailing/Form/Upload.tpl
+++ b/templates/CRM/Mailing/Form/Upload.tpl
@@ -125,6 +125,3 @@
     }
 </script>
 {/literal}
-
-{* include jscript to warn if unsaved form field changes *}
-{include file="CRM/common/formNavigate.tpl"}