Merge branch 'hotline#158464_agenda_vide' into 'master'

hotline#158464 : Theme Warehouse: agenda part display should have id set and not empty

See merge request !4497

VERSIONS_HOTLINE/158464

+ - correctif #158464 : Magasin de Thèmes : Correction de l'affichage des listes de documents en mode grille dans les pages mon compte, notice et bibliothèque.
\ No newline at end of file

library/templates/Intonation/View/RenderWall.php

@@ -28,7 +28,9 @@ class Intonation_View_RenderWall extends Intonation_View_Abstract_Layout {
 
 
   public function setIdModule($_id_module) {
-    $this->_masonry_id = $_id_module ?? '';
+    $this->_masonry_id = $_id_module
+      ? $_id_module
+      : static::getTimeSource()->uniqid();
   }
 
 

tests/scenarios/Templates/TemplatesWidgetTest.php

@@ -1068,6 +1068,58 @@ class TemplatesDispatchLibraryWidgetTest extends TemplatesIntonationTestCase {
 
 
 
+class TemplatesDispatchLibraryAgendaWidgetTest extends TemplatesIntonationTestCase {
+
+  public function setUp() {
+    parent::setUp();
+
+    $annecy = $this->fixture(Class_Bib::class,
+                             ['id' => 1,
+                              'libelle' => 'Annecy']);
+
+    $this->fixture(Class_Lieu::class,
+                   ['id' => 1,
+                    'libelle' => 'Annecy',
+                    'bibs' => [$annecy]]);
+
+    $ete = $this->fixture(Class_Article::class,
+                          ['id' => 78,
+                           'titre' => 'L\'été',
+                           'contenu' => 'À la mer',
+                           'id_lieu' => 1]);
+
+    Intonation_View_RenderWall::setTimeSource((new TimeSourceForTest('2022-06-06 10:10:00'))
+                                              ->uniqidCallback(fn() => 'MyUn1qAndOnly'));
+
+    $this->onLoaderOfModel(Class_Article::class)
+         ->whenCalled('getArticlesByPreferences')
+         ->answers([$ete]);
+
+    $this->dispatch('/opac/bib/agenda/id/1/id_profil/72');
+  }
+
+
+  public function tearDown() {
+    Intonation_View_RenderWall::setTimeSource(null);
+    parent::tearDown();
+  }
+
+
+  /** @test */
+  public function annecyCalendarShouldContainsLete() {
+    $this->assertXPathContentContains('//div', 'L\'été');
+  }
+
+
+  /** @test */
+  public function annecyCalendarShouldContainsDivClassMasonryWithIdMyUniqueAndOnly() {
+    $this->assertXPath('//div[@class="masonry"][@id="MyUn1qAndOnly"]');
+  }
+}
+
+
+
+
 class TemplatesWidgetCalendarTest extends TemplatesIntonationTestCase {
   protected $_vacances;