hotline#95499 : rendezvous : fix sql error on rendezvous index when no customfields defined

VERSIONS_HOTLINE/95499

+ - ticket #95499 : RendezVous : Correction plantage erreur SQL en absence de champs personnalisés
\ No newline at end of file

library/Class/CustomField/Value.php

@@ -33,15 +33,15 @@ class Class_CustomField_ValueLoader extends Storm_Model_Loader {
 
   public function findAllByInstance($instance) {
     if (!$instance
-        || (!$model = Class_CustomField_Model::getModel(get_class($instance))))
+        || (!$model = Class_CustomField_Model::getModel(get_class($instance)))
+        || (!$fields = $model->getFields()))
       return [];
 
-    $fields = $model->getFields();
     $field_ids = array_map(function($f) {return $f->getId();},
                            $fields);
 
-    return $this->findAllBy(['model_id' => $instance->getId(),
-                             'custom_field_id' => $field_ids]);
+    return Class_CustomField_Value::findAllBy(['model_id' => $instance->getId(),
+                                               'custom_field_id' => $field_ids]);
   }
 }
 

tests/scenarios/RendezVous/UsergroupAgendaAdminTest.php

@@ -76,6 +76,31 @@ abstract class UsergroupAgendaAdminModoPortailLoggedTestCase extends Admin_Abstr
 
 
 
+/** @see https://forge.afi-sa.net/issues/95499  */
+class UsergroupAgendaAdminIndexWithoutCustomFieldsTest
+  extends UsergroupAgendaAdminModoPortailLoggedTestCase {
+  public function setUp() {
+    parent::setUp();
+    $groupagenda = $this->fixture('Class_UserGroup_Agenda',
+                                  ['id' => 5,
+                                   'libelle' => 'MonAgenda',
+                                   'model_class' => 'Class_RendezVous']);
+
+    $this->onLoaderOfModel('Class_CustomField_Value');
+
+    $this->dispatch('/admin/usergroup-agenda');
+  }
+
+
+  /** @test */
+  public function shouldNotCallFindCustomFieldValues() {
+    $this->assertFalse(Class_CustomField_Value::methodHasBeenCalled('findAllBy'));
+  }
+}
+
+
+
+
 class UsergroupAgendaAdminIndexValidTest extends UsergroupAgendaAdminModoPortailLoggedTestCase {
   public function setUp() {
     parent::setUp();