Merge branch 'release_8_158' into 'master'

fix bokeh to release 8.0.158

See merge request !4464

library/templates/Intonation/View/OsmMap.php

@@ -64,10 +64,6 @@ class Intonation_View_OsmMap extends ZendAfi_View_Helper_BaseHelper {
 
   public function renderHeadScriptsOn($script_loader) {
     $script_loader
-      ->loadJQuery()
-      ->loadJQueryUI()
-      ->addOPACScript('subModal')
-      ->addAdminScripts(['onload_utils', 'global'])
       ->loadLeafletJS()
       ->addOPACScripts(['openStreetMap/openStreetMap.js',
                         'openStreetMap/leaflet.markercluster.js'])

library/templates/Intonation/View/RenderRecord/RenderItems.php

@@ -245,10 +245,9 @@ abstract class Intonation_View_RenderRecord_RenderItemsStrategy {
 
 
   protected function _itemsWithMap(array $items, array $same_work, array $html) : array {
-    $html [] = $this->_renderMapHTML($items, $same_work);
-    return
-      array_merge($html,
-                  $this->_itemsWithoutMap($items, $same_work, $html));
+    return $this->_itemsWithoutMap($items,
+                                   $same_work,
+                                   [$this->_renderMapHTML($items, $same_work)]);
   }
 
 

tests/scenarios/Templates/TemplatesSearchItemsTest.php

@@ -1039,7 +1039,6 @@ class TemplatesSearchItems15ItemsPaginationThreshold12AndAvailabilityKohaLimit1A
 
 
 
-
 class TemplatesSearchItems15ItemsPaginationThreshold20AndAvailabilityKohaLimit20AndMapTests
   extends TemplatesSearchItemsKohaThresholdsTestCase {
 
@@ -1094,7 +1093,13 @@ class TemplatesSearchItems15ItemsPaginationThreshold20AndAvailabilityKohaLimit20
 
 
   /** @test */
-  public function mapShouldBePresent() {
-    $this->assertXPath('//div//div[contains(@class,"items_map")]');
+  public function mapShouldBePresentOnlyOnce() {
+    $this->assertXPathCount('//div//div[contains(@class,"items_map col-12 mb-3")]', 1);
+  }
+
+
+  /** @test */
+  public function jqueryShouldNotBeNotBeLoaded() {
+    $this->assertNotXPath('//script[contains(@src, "jquery")]');
   }
 }
\ No newline at end of file