From d51e2d1f7ca67c9704a61fde2155515a6f637efa Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Wed, 27 Apr 2022 08:50:34 +1200
Subject: [PATCH] [Import] E-notice fix

This fixes 1 of 2 notices on the Contact import field mapping screen.
- instead of assigning a variable for show-hide it uses jquery
---
 CRM/Contact/Import/Form/MapField.php           | 13 ++-----------
 templates/CRM/Contact/Import/Form/MapTable.tpl | 14 +++++++-------
 2 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/CRM/Contact/Import/Form/MapField.php b/CRM/Contact/Import/Form/MapField.php
index 7b6cfca1fc..5947fdf339 100644
--- a/CRM/Contact/Import/Form/MapField.php
+++ b/CRM/Contact/Import/Form/MapField.php
@@ -390,7 +390,7 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField {
    * @param array $fields
    *   Posted values of the form.
    *
-   * @return array
+   * @return array|true
    *   list of errors to be posted back to the form
    */
   public static function formRule($fields) {
@@ -411,16 +411,7 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField {
     if (!empty($fields['saveMapping'])) {
       $template->assign('isCheked', TRUE);
     }
-
-    if (!empty($errors)) {
-      $_flag = 1;
-      $assignError = new CRM_Core_Page();
-      $assignError->assign('mappingDetailsError', $_flag);
-      return $errors;
-    }
-    else {
-      return TRUE;
-    }
+    return empty($errors) ? TRUE : $errors;
   }
 
   /**
diff --git a/templates/CRM/Contact/Import/Form/MapTable.tpl b/templates/CRM/Contact/Import/Form/MapTable.tpl
index 1b651d7ac5..aaa9ed8851 100644
--- a/templates/CRM/Contact/Import/Form/MapTable.tpl
+++ b/templates/CRM/Contact/Import/Form/MapTable.tpl
@@ -86,14 +86,14 @@
           </tr>
         </table>
       </div>
-      <script type="text/javascript">
-        {if $mappingDetailsError }
-          cj('#saveDetails').show();
-        {else}
-          cj('#saveDetails').hide();
-        {/if}
-
         {literal}
+        <script type="text/javascript">
+          if (cj('#saveMapping').prop('checked')) {
+            cj('#saveDetails').show();
+          } else {
+            cj('#saveDetails').hide();
+          }
+
           function showSaveDetails(chkbox) {
             if (chkbox.checked) {
               document.getElementById("saveDetails").style.display = "block";
-- 
2.25.1