From c8f843857f3ec7bac4283982302d254c6a38a4b3 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Thu, 5 May 2022 11:33:19 +1200 Subject: [PATCH] [REF] [Import] Remove unused tpl assign showColNames --- CRM/Contact/Import/Form/MapField.php | 1 - CRM/Contact/Import/Form/Preview.php | 8 -------- CRM/Custom/Import/Form/MapField.php | 2 -- 3 files changed, 11 deletions(-) diff --git a/CRM/Contact/Import/Form/MapField.php b/CRM/Contact/Import/Form/MapField.php index b0fc69991c..ab5beededf 100644 --- a/CRM/Contact/Import/Form/MapField.php +++ b/CRM/Contact/Import/Form/MapField.php @@ -108,7 +108,6 @@ class CRM_Contact_Import_Form_MapField extends CRM_Import_Form_MapField { $this->_formattedFieldNames[$contactType] = $this->_mapperFields = array_merge($this->_mapperFields, $formattedFieldNames); $columnNames = $this->getColumnHeaders(); - $this->assign('showColNames', !empty($columnNames)); $this->_columnCount = $this->getNumberOfColumns(); $this->_columnNames = $columnNames; diff --git a/CRM/Contact/Import/Form/Preview.php b/CRM/Contact/Import/Form/Preview.php index ba6e918432..20ecbdcd0d 100644 --- a/CRM/Contact/Import/Form/Preview.php +++ b/CRM/Contact/Import/Form/Preview.php @@ -94,14 +94,6 @@ class CRM_Contact_Import_Form_Preview extends CRM_Import_Form_Preview { $this->assign('dataValues', $this->getDataRows(2)); $this->setStatusUrl(); - - $showColNames = TRUE; - if ('CRM_Import_DataSource_CSV' == $this->get('dataSource') && - !$this->getSubmittedValue('skipColumnHeader') - ) { - $showColNames = FALSE; - } - $this->assign('showColNames', $showColNames); } /** diff --git a/CRM/Custom/Import/Form/MapField.php b/CRM/Custom/Import/Form/MapField.php index e7d6cd7558..79bb9e4376 100644 --- a/CRM/Custom/Import/Form/MapField.php +++ b/CRM/Custom/Import/Form/MapField.php @@ -35,8 +35,6 @@ class CRM_Custom_Import_Form_MapField extends CRM_Contact_Import_Form_MapField { $skipColumnHeader = $this->controller->exportValue('DataSource', 'skipColumnHeader'); $this->_onDuplicate = $this->get('onDuplicate'); if ($skipColumnHeader) { - //showColNames needs to be true to show "Column Names" column - $this->assign('showColNames', $skipColumnHeader); $this->assign('columnNames', $columnNames); /* if we had a column header to skip, stash it for later */ $this->_columnHeaders = $this->_dataValues[0]; -- 2.25.1