tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

FIX processAll method respects $preview flag

Browse Source 
The preview flag is now respected more thoroughly to stop writing of related objects
This commit is contained in:
Daniel Hensby 2013-03-19 11:23:58 +00:00
parent 3020576f08
commit 0d57f7b19a
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
dev/CsvBulkLoader.php
View File

@ -88,27 +88,36 @@ class CsvBulkLoader extends BulkLoader {
if(!$relationObj || !$relationObj->exists()) { if(!$relationObj || !$relationObj->exists()) {
$relationClass = $obj->has_one($relationName); $relationClass = $obj->has_one($relationName);
$relationObj = new $relationClass(); $relationObj = new $relationClass();
$relationObj->write(); //write if we aren't previewing
if (!$preview) $relationObj->write();
} }
$obj->{"{$relationName}ID"} = $relationObj->ID; $obj->{"{$relationName}ID"} = $relationObj->ID;
$obj->write(); //write if we are not previewing
$obj->flushCache(); // avoid relation caching confusion if (!$preview) {
$obj->write();
$obj->flushCache(); // avoid relation caching confusion
}
} elseif(strpos($fieldName, '.') !== false) { } elseif(strpos($fieldName, '.') !== false) {
// we have a relation column with dot notation // we have a relation column with dot notation
list($relationName,$columnName) = explode('.', $fieldName); list($relationName, $columnName) = explode('.', $fieldName);
// always gives us an component (either empty or existing) // always gives us an component (either empty or existing)
$relationObj = $obj->getComponent($relationName); $relationObj = $obj->getComponent($relationName);
$relationObj->write(); if (!$preview) $relationObj->write();
$obj->{"{$relationName}ID"} = $relationObj->ID; $obj->{"{$relationName}ID"} = $relationObj->ID;
$obj->write(); //write if we are not previewing
$obj->flushCache(); // avoid relation caching confusion if (!$preview) {
$obj->write();
$obj->flushCache(); // avoid relation caching confusion
}
} }
} }
// second run: save data // second run: save data
foreach($record as $fieldName => $val) { foreach($record as $fieldName => $val) {
//break out of the loop if we are previewing
if ($preview) break;
if($this->isNullValue($val, $fieldName)) continue; if($this->isNullValue($val, $fieldName)) continue;
if(strpos($fieldName, '->') !== FALSE) { if(strpos($fieldName, '->') !== FALSE) {
$funcName = substr($fieldName, 2); $funcName = substr($fieldName, 2);