From bdfff5bee3c470c720dc27de6633fad50cbca963 Mon Sep 17 00:00:00 2001 From: ajshort Date: Wed, 4 May 2011 11:40:00 +1000 Subject: [PATCH] MINOR: Updated TableField to use ArrayList rather than DataObjectSet when using a DataList. --- forms/TableField.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/forms/TableField.php b/forms/TableField.php index 5c7aedf5f..2e33eed1b 100644 --- a/forms/TableField.php +++ b/forms/TableField.php @@ -164,9 +164,10 @@ class TableField extends TableListField { $rows = $this->sortData(ArrayLib::invert($this->value)); // ignore all rows which are already saved if(isset($rows['new'])) { - if($sourceItems instanceof DataList) $sourceItems = $sourceItems->toDataObjectSet(); - - + if($sourceItems instanceof DataList) { + $sourceItems = new ArrayList($sourceItems->toArray()); + } + $newRows = $this->sortData($rows['new']); // iterate over each value (not each row) $i = 0; @@ -183,7 +184,7 @@ class TableField extends TableListField { // generate a temporary DataObject container (not saved in the database) $sourceClass = $this->sourceClass(); - $sourceItems->push(new $sourceClass($newRow)); + $sourceItems->add(new $sourceClass($newRow)); $i++; }