Merge pull request #746 from Sophist-UK/sophist_fix_importcsv

Fix import from CSV
Fabrik · Jun 20, 2013 · 7a3c4df · 7a3c4df
2 parents ba2f1c6 + cd95a2e
commit 7a3c4df
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/components/com_fabrik/models/form.php b/components/com_fabrik/models/form.php
@@ -1655,6 +1655,8 @@ protected function submitToDatabase($rowId = '0')
 				{
 					$listModel->encrypt[] = $elementModel->getElement()->name;
 				}
+				// Following line added to fix importcsv where data from first row is used for every row.
+				$elementModel->defaults = null;
 				$elementModel->onStoreRow($data);
 			}
 		}

diff --git a/components/com_fabrik/models/importcsv.php b/components/com_fabrik/models/importcsv.php
@@ -736,7 +736,7 @@ public function insertData()
 			}
 			if (!$tableJoinsFound)
 			{
-				$formModel->formData = $aRow;
+				$formModel->formData = $formModel->formDataWithTableName = $aRow;
 				if (!in_array(false, FabrikWorker::getPluginManager()->runPlugins('onImportCSVRow', $model, 'list')))
 				{
 					$formModel->processToDB();