From a02e8e6636b393eebd14da1afed41fc021ce3f7c Mon Sep 17 00:00:00 2001 From: kiswa Date: Wed, 23 Nov 2016 15:06:51 +0000 Subject: [PATCH] WIP - Model updates --- src/api/models/Board.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/api/models/Board.php b/src/api/models/Board.php index 1e0431d..c92fd45 100644 --- a/src/api/models/Board.php +++ b/src/api/models/Board.php @@ -110,12 +110,21 @@ class Board extends BaseModel { foreach($fromArray as $item) { $obj = $ctor($item->id); + $obj->loadFromJson(json_encode($item)); - if ($obj->id === 0) { - $obj->loadFromJson(json_encode($item)); + $i = -1; + foreach($toArray as $index => $existing) { + if ($existing->id === $obj->id) { + $i = $index; + break; + } } - $toArray[] = $obj; + if ($i !== -1) { + $toArray[$i] = $obj; + } else { + $toArray[] = $obj; + } } }