Skip to content
Snippets Groups Projects

Master

Merged Patrick Barroca requested to merge master into WIP
Compare and
9 files
+ 30
128
Preferences
Compare changes
Files
9
@@ -28,8 +28,8 @@ class Multimedia_DeviceLoader extends Storm_Model_Loader {
public function fromJsonModelWithGroup($json_model, $device_group) {
if (!$model = $this->findByIdOrigineAndLocation($json_model->id, $device_group->getLocation()))
$model = $this->newInstance()->setIdOrigine($this->getIdOrigineWithLocation($json_model->id, $device_group->getLocation()));
$note = isset($json_model->note)
? $json_model->note
$note = isset($json_model->notes)
? $json_model->notes
: '';
$model