Remove conflict download from preview

I can't see where these would arise - but definitely
not on the preview screen - which only runs basic validation

diff --git a/CRM/Contact/Import/Form/Preview.php b/CRM/Contact/Import/Form/Preview.php
index 3818a1ce00b38f4f35024a6e7988d4c687ee3676..922745ad8202a5f785c0fa1a2c5132f1aa7243ea 100644 (file)
--- a/CRM/Contact/Import/Form/Preview.php
+++ b/CRM/Contact/Import/Form/Preview.php
@@ -77,17 +77,8 @@ class CRM_Contact_Import_Form_Preview extends CRM_Import_Form_Preview {
       $this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
     }
 
-    $properties = array(
-      'conflictRowCount',
-      'downloadConflictRecordsUrl',
-      'downloadMismatchRecordsUrl',
-    );
-
     $this->assign('mapper', $this->getMappedFieldLabels());
 
-    foreach ($properties as $property) {
-      $this->assign($property, $this->get($property));
-    }
     $this->assign('dataValues', $this->getDataRows([], 2));
 
     $this->setStatusUrl();

diff --git a/templates/CRM/Contact/Import/Form/Preview.tpl b/templates/CRM/Contact/Import/Form/Preview.tpl
index 5e883e2664a5f10d6f30ca5b17110c9399215530..93bea4cec1f2bd0f60dadbea14e95f867ee4223b 100644 (file)
--- a/templates/CRM/Contact/Import/Form/Preview.tpl
+++ b/templates/CRM/Contact/Import/Form/Preview.tpl
@@ -54,17 +54,6 @@
     </tr>
     {/if}
 
-    {if $conflictRowCount}
-    <tr class="error"><td class="label crm-grid-cell">{ts}Conflicting Rows{/ts}</td>
-        <td class="data">{$conflictRowCount}</td>
-        <td class="explanation">{ts}Rows with conflicting email addresses within this file. These rows will be skipped (not imported).{/ts}
-            {if $conflictRowCount}
-                <div class="action-link"><a href="{$downloadConflictRecordsUrl}"><i class="crm-i fa-download" aria-hidden="true"></i> {ts}Download Conflicts{/ts}</a></div>
-            {/if}
-        </td>
-    </tr>
-    {/if}
-
     <tr>
     <td class="label crm-grid-cell">{ts}Valid Rows{/ts}</td>
         <td class="data">{$validRowCount}</td>