From c72923f71db0b73ce19d73f45dc8f816038d3578 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Wed, 10 Aug 2022 19:18:46 +1200
Subject: [PATCH] Move unshared code to unshared function

---
 .../CRM/Contact/Import/Form/MapField.tpl      | 20 +++++++++++++++++
 .../CRM/Contact/Import/Form/MapTable.tpl      | 22 -------------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/templates/CRM/Contact/Import/Form/MapField.tpl b/templates/CRM/Contact/Import/Form/MapField.tpl
index a5f888946d..7168bf9fd5 100644
--- a/templates/CRM/Contact/Import/Form/MapField.tpl
+++ b/templates/CRM/Contact/Import/Form/MapField.tpl
@@ -21,6 +21,26 @@
   {* Table for mapping data to CRM fields *}
  {include file="CRM/Contact/Import/Form/MapTable.tpl" mapper=$form.mapper}
 
+ {* // Set default location type *}
+ {literal}
+   <script type="text/javascript">
+     CRM.$(function($) {
+       var defaultLocationType = "{/literal}{$defaultLocationType}{literal}";
+       if (defaultLocationType.length) {
+        $('#map-field').on('change', 'select[id^="mapper"][id$="_0"]', function() {
+          var select = $(this).next();
+          $('option', select).each(function() {
+            if ($(this).attr('value') == defaultLocationType  && $(this).text() == {/literal}{
+              $defaultLocationTypeLabel|@json_encode}{literal}) {
+              select.val(defaultLocationType);
+            }
+          });
+        });
+       }
+     });
+   </script>
+ {/literal}
+
 <script type="text/javascript" >
 {literal}
 if ( document.getElementsByName("saveMapping")[0].checked ) {
diff --git a/templates/CRM/Contact/Import/Form/MapTable.tpl b/templates/CRM/Contact/Import/Form/MapTable.tpl
index b13969c0fd..4e8041ba74 100644
--- a/templates/CRM/Contact/Import/Form/MapTable.tpl
+++ b/templates/CRM/Contact/Import/Form/MapTable.tpl
@@ -8,25 +8,3 @@
  +--------------------------------------------------------------------+
 *}
 {include file="CRM/Import/Form/MapTableCommon.tpl"}
-
-{if $wizard.currentStepName != 'Preview'}
-  {* // Set default location type *}
-  {literal}
-    <script type="text/javascript">
-    CRM.$(function($) {
-      var defaultLocationType = "{/literal}{$defaultLocationType}{literal}";
-      if (defaultLocationType.length) {
-        $('#map-field').on('change', 'select[id^="mapper"][id$="_0"]', function() {
-          var select = $(this).next();
-          $('option', select).each(function() {
-            if ($(this).attr('value') == defaultLocationType  && $(this).text() == {/literal}{
-              $defaultLocationTypeLabel|@json_encode}{literal}) {
-              select.val(defaultLocationType);
-            }
-          });
-        });
-      }
-    });
-    </script>
-  {/literal}
-{/if}
-- 
2.25.1