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
civicrm · May 5, 2022 · d3bb0df · d3bb0df
1 parent 99e3c5f
commit d3bb0df
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 20 deletions.
diff --git a/CRM/Contact/Import/Form/Preview.php b/CRM/Contact/Import/Form/Preview.php
@@ -77,17 +77,8 @@ public function preProcess() {
       $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
@@ -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>