|
@@ -135,7 +135,7 @@ discard block |
|
|
block discarded – undo |
|
135
|
135
|
$instance = $item->getEntity(); |
|
136
|
136
|
$data = $row->toArray(); |
|
137
|
137
|
|
|
138
|
|
- foreach ((array)$item->getFieldAlias() as $fieldname => $fieldalias) { |
|
|
138
|
+ foreach ((array) $item->getFieldAlias() as $fieldname => $fieldalias) { |
|
139
|
139
|
if (isset($data[$fieldalias])) { |
|
140
|
140
|
$data[$fieldname] = $data[$fieldalias]; |
|
141
|
141
|
unset($fieldalias); |
|
@@ -143,7 +143,7 @@ discard block |
|
|
block discarded – undo |
|
143
|
143
|
} |
|
144
|
144
|
BinderObject::bindObject($data, $instance); |
|
145
|
145
|
|
|
146
|
|
- foreach ((array)$item->getFieldMap() as $property => $fieldmap) { |
|
|
146
|
+ foreach ((array) $item->getFieldMap() as $property => $fieldmap) { |
|
147
|
147
|
$selectMask = $fieldmap[Mapper::FIELDMAP_SELECTMASK]; |
|
148
|
148
|
$value = isset($data[$fieldmap[Mapper::FIELDMAP_FIELD]]) ? $data[$fieldmap[Mapper::FIELDMAP_FIELD]] : ""; |
|
149
|
149
|
$data[$property] = $selectMask($value, $instance); |
|
@@ -169,7 +169,7 @@ discard block |
|
|
block discarded – undo |
|
169
|
169
|
$array = $this->getMapper()->prepareField($array); |
|
170
|
170
|
|
|
171
|
171
|
// Mapping the data |
|
172
|
|
- foreach ((array)$this->getMapper()->getFieldMap() as $property => $fieldmap) { |
|
|
172
|
+ foreach ((array) $this->getMapper()->getFieldMap() as $property => $fieldmap) { |
|
173
|
173
|
$fieldname = $fieldmap[Mapper::FIELDMAP_FIELD]; |
|
174
|
174
|
$updateMask = $fieldmap[Mapper::FIELDMAP_UPDATEMASK]; |
|
175
|
175
|
|
|
@@ -191,7 +191,7 @@ discard block |
|
|
block discarded – undo |
|
191
|
191
|
->fields(array_keys($array)); |
|
192
|
192
|
|
|
193
|
193
|
// Check if is insert or update |
|
194
|
|
- if (empty($array[$this->mapper->getPrimaryKey()]) || count($this->get($array[$this->mapper->getPrimaryKey()])) === 0) { |
|
|
194
|
+ if (empty($array[$this->mapper->getPrimaryKey()]) || count($this->get($array[$this->mapper->getPrimaryKey()])) === 0) { |
|
195
|
195
|
$array[$this->mapper->getPrimaryKey()] = $this->insert($updatable, $array); |
|
196
|
196
|
BinderObject::bindObject($array, $instance); |
|
197
|
197
|
} else { |