projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove last in-between parser class
[civicrm-core.git]
/
CRM
/
Event
/
Import
/
Form
/
Preview.php
diff --git
a/CRM/Event/Import/Form/Preview.php
b/CRM/Event/Import/Form/Preview.php
index ccec35738ac2e8284a9132163164c9288b8d2097..3357c97f4f99d42080e34fd5fca6ad3c81d692ce 100644
(file)
--- a/
CRM/Event/Import/Form/Preview.php
+++ b/
CRM/Event/Import/Form/Preview.php
@@
-27,7
+27,7
@@
class CRM_Event_Import_Form_Preview extends CRM_Import_Form_Preview {
* @return void
*/
public function preProcess() {
* @return void
*/
public function preProcess() {
-
$skipColumnHeader = $this->controller->exportValue('DataSource', 'skipColumnHeader'
);
+
parent::preProcess(
);
//get the data from the session
$dataValues = $this->get('dataValues');
//get the data from the session
$dataValues = $this->get('dataValues');
@@
-45,26
+45,18
@@
class CRM_Event_Import_Form_Preview extends CRM_Import_Form_Preview {
}
$this->assign('savedMappingName', $mappingId ? $mapDAO->name : NULL);
}
$this->assign('savedMappingName', $mappingId ? $mapDAO->name : NULL);
- if ($skipColumnHeader) {
- $this->assign('skipColumnHeader', $skipColumnHeader);
- $this->assign('rowDisplayCount', 3);
- }
- else {
- $this->assign('rowDisplayCount', 2);
- }
-
if ($invalidRowCount) {
if ($invalidRowCount) {
- $urlParams = 'type=' . CRM_Import_Parser::ERROR . '&parser=CRM_Event_Import_Parser';
+ $urlParams = 'type=' . CRM_Import_Parser::ERROR . '&parser=CRM_Event_Import_Parser
_Participant
';
$this->set('downloadErrorRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
}
if ($conflictRowCount) {
$this->set('downloadErrorRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
}
if ($conflictRowCount) {
- $urlParams = 'type=' . CRM_Import_Parser::CONFLICT . '&parser=CRM_Event_Import_Parser';
+ $urlParams = 'type=' . CRM_Import_Parser::CONFLICT . '&parser=CRM_Event_Import_Parser
_Participant
';
$this->set('downloadConflictRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
}
if ($mismatchCount) {
$this->set('downloadConflictRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
}
if ($mismatchCount) {
- $urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Event_Import_Parser';
+ $urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Event_Import_Parser
_Participant
';
$this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
}
$this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
}
@@
-95,7
+87,6
@@
class CRM_Event_Import_Form_Preview extends CRM_Import_Form_Preview {
public function postProcess() {
$fileName = $this->controller->exportValue('DataSource', 'uploadFile');
$separator = $this->controller->exportValue('DataSource', 'fieldSeparator');
public function postProcess() {
$fileName = $this->controller->exportValue('DataSource', 'uploadFile');
$separator = $this->controller->exportValue('DataSource', 'fieldSeparator');
- $skipColumnHeader = $this->controller->exportValue('DataSource', 'skipColumnHeader');
$invalidRowCount = $this->get('invalidRowCount');
$conflictRowCount = $this->get('conflictRowCount');
$onDuplicate = $this->get('onDuplicate');
$invalidRowCount = $this->get('invalidRowCount');
$conflictRowCount = $this->get('conflictRowCount');
$onDuplicate = $this->get('onDuplicate');
@@
-120,7
+111,7
@@
class CRM_Event_Import_Form_Preview extends CRM_Import_Form_Preview {
}
$parser->run($fileName, $separator,
$mapperFields,
}
$parser->run($fileName, $separator,
$mapperFields,
- $
skipColumnHeader
,
+ $
this->getSubmittedValue('skipColumnHeader')
,
CRM_Import_Parser::MODE_IMPORT,
$this->get('contactType'),
$onDuplicate
CRM_Import_Parser::MODE_IMPORT,
$this->get('contactType'),
$onDuplicate
@@
-148,11
+139,11
@@
class CRM_Event_Import_Form_Preview extends CRM_Import_Form_Preview {
fclose($fd);
$this->set('errorFile', $errorFile);
fclose($fd);
$this->set('errorFile', $errorFile);
- $urlParams = 'type=' . CRM_Import_Parser::ERROR . '&parser=CRM_Event_Import_Parser';
+ $urlParams = 'type=' . CRM_Import_Parser::ERROR . '&parser=CRM_Event_Import_Parser
_Participant
';
$this->set('downloadErrorRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
$this->set('downloadErrorRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
- $urlParams = 'type=' . CRM_Import_Parser::CONFLICT . '&parser=CRM_Event_Import_Parser';
+ $urlParams = 'type=' . CRM_Import_Parser::CONFLICT . '&parser=CRM_Event_Import_Parser
_Participant
';
$this->set('downloadConflictRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
$this->set('downloadConflictRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
- $urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Event_Import_Parser';
+ $urlParams = 'type=' . CRM_Import_Parser::NO_MATCH . '&parser=CRM_Event_Import_Parser
_Participant
';
$this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
}
}
$this->set('downloadMismatchRecordsUrl', CRM_Utils_System::url('civicrm/export', $urlParams));
}
}