Merge branch...

Merge branch 'dev#49315_ajouter_un_commentaire_sur_les_postes_etou_groupe_de_poste_visible_lors_de_la_reservation_cote_bokeh' into 'stable'

dev #49315 fix note json key

See merge request !2407

VERSIONS_WIP/49315

+ - ticket #49315 : AFI Multimedia : correction de l'enregistrement des notes de postes.
+ 
\ No newline at end of file

library/Class/Multimedia/Device.php

@@ -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

tests/application/modules/push/controllers/MultimediaControllerTest.php

@@ -115,7 +115,7 @@ l66WXceACmsgGWEdHMB7ZPUd4HqR5bdE1Xnr1Q0Z9IIku6Naxt/yy0P5Gv+ZlW7U
     $this->fixture('Class_Multimedia_Device', ['id' => 34, 'id_origine' => '1-34']);
     $this->fixture('Class_Multimedia_DeviceGroup', ['id' => 1, 'id_origine' => '1-64', 'libelle'=>'groupe Y']);
 
-    $datas = '[{"libelle":"Groupe 1", "id":2, "site":{"id":1,"libelle":"Site 1","admin_url":"192.168.2.92"}, "postes":[{"id":1, "libelle":"Poste 1", "os":"Windows XP", "maintenance":"1", "note":"Le clavier a perdu des touches."}, {"id":2, "libelle":"Poste 2", "os":"Ubuntu Lucid Lynx", "maintenance":"0"}]}]';
+    $datas = '[{"libelle":"Groupe 1", "id":2, "site":{"id":1,"libelle":"Site 1","admin_url":"192.168.2.92"}, "postes":[{"id":1, "libelle":"Poste 1", "os":"Windows XP", "maintenance":"1", "notes":"Le clavier a perdu des touches."}, {"id":2, "libelle":"Poste 2", "os":"Ubuntu Lucid Lynx", "maintenance":"0"}]}]';
 
     $this->postDispatch(
         '/push/multimedia/config',