Merge branch 'summon_new_features_24.06.00_cr' into summon_new_featur…

…es_24.06.00_ab
PTFS-Europe · May 28, 2024 · e1ccad6 · e1ccad6
2 parents e297d92 + ae13f23
commit e1ccad6
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 8 deletions.
diff --git a/code/folio_export/folio_export.jar b/code/folio_export/folio_export.jar
diff --git a/code/web/interface/themes/responsive/Search/explore-more-bar.tpl b/code/web/interface/themes/responsive/Search/explore-more-bar.tpl
@@ -1,5 +1,6 @@
 {strip}
 	{* TODO: Consider renaming classes to assume they are under the exploreMoreBar class *}
+{if !empty($showExploreMoreOptions)}
 <div class="exploreMoreBar row">
 	{*<div class="label-left">*}
 	<div class="label-top">
@@ -50,4 +51,9 @@
 	</div>
 
 </div>
-{/strip}
+{else}
+	<div>
+	</div>
+{/if}
+{/strip}
+
diff --git a/code/web/interface/themes/responsive/images/summon.png:Zone.Identifier b/code/web/interface/themes/responsive/images/summon.png:Zone.Identifier
@@ -0,0 +1,4 @@
+[ZoneTransfer]
+ZoneId=3
+ReferrerUrl=https://www.google.com/
+HostUrl=https://files.mtstatic.com/site_11811/55152/0?Expires=1708452791&Signature=O-eIysOYl-1drJTT2f6LTnuDXMhKycAnvuWBQT53Y5WC-uFeYwIE744-kFoVgc-gDsc1ODNBFX1G09SEdxs6NAzaBLFM1c9V0Xq3GZiKsUMivxIQC8YNpa9VHLWM0KE-snOgnMcGuuzuqvpFNAZA5J7FNpYuE~F2eWzOKKYIdhw_&Key-Pair-Id=APKAJ5Y6AV4GI7A555NA
diff --git a/code/web/release_notes/24.06.00.MD b/code/web/release_notes/24.06.00.MD
@@ -3,11 +3,9 @@
 ## Aspen Discovery Updates
 //mark
 
-//alexander
+
 ### Summon Updates
-- Added control over whether images avaialble from the API are used in a Summon Search or whether Aspen created covers only should be used - impacts load speed. (*AB*)
-- Limited Summon Search results to those within each libraries subscription. (*AB / JO*)
-- Added limit filters for Summon Search - search by whether record is scholarly and whether it is peer reviewed. (*AB / JO*)
+
 ### Koha Updates
 - When a user has opted out of auto-renewal, do not show auto-renewal message even if the title is otherwise eligible for auto-renewal.  (Ticket 131789) (*MDN*)
 

diff --git a/code/web/sys/DBMaintenance/version_updates/23.12.01.php b/code/web/sys/DBMaintenance/version_updates/23.12.01.php
@@ -19,5 +19,5 @@ function getUpdates23_12_01(): array {
 				'UPDATE overdrive_settings SET runFullUpdate = 1',
 			]
 		], //force_overdrive_full_update
-    ];
+	];
 }
diff --git a/code/web/sys/DBMaintenance/version_updates/24.05.00.php b/code/web/sys/DBMaintenance/version_updates/24.05.00.php
@@ -123,8 +123,6 @@ function getUpdates24_05_00(): array {
 				 'ALTER TABLE javascript_snippets ADD COLUMN containsAnalyticsCookies TINYINT(1)'
 			 ]
 		 ], //Snippet_Contains_Marketing_Cookies
-
-
 	];
 }
 

diff --git a/code/web/sys/Interface.php b/code/web/sys/Interface.php
@@ -740,6 +740,7 @@ function loadDisplayOptions($fromBookCoverProcessing = false) {
 		$this->assign('showDisplayNameInHeader', $library->showDisplayNameInHeader);
 		$this->assign('externalMaterialsRequestUrl', $library->externalMaterialsRequestUrl);
 		$this->assign('languageAndDisplayInHeader', $library->languageAndDisplayInHeader);
+		$this->assign('showExploreMoreOptions', $library->getLayoutSettings()->showExploreMoreOptions);
 
 		if ($location != null) {
 			$this->assign('showDisplayNameInHeader', $location->showDisplayNameInHeader);

diff --git a/code/web/sys/Theming/LayoutSetting.php b/code/web/sys/Theming/LayoutSetting.php
@@ -16,6 +16,7 @@ class LayoutSetting extends DataObject {
 	public $showTopOfPageButton;
 	public $dismissPlacardButtonLocation;
 	public $dismissPlacardButtonIcon;
+	public $showExploreMoreOptions;
 	public $contrastRatio;
 
 	static function getObjectStructure($context = ''): array {
@@ -103,6 +104,13 @@ static function getObjectStructure($context = ''): array {
 				'description' => 'Whether or not to show icon instead of default dismiss placard text',
 				'default' => false,
 			],
+			'showExploreMoreOptions' => [
+				'property' => 'showExploreMoreOptions',
+				'type' => 'checkbox',
+				'label' => 'Show Explore More Options',
+				'description' => 'Whether or not to display the Explore More Options box.',
+				'default' => true,
+			],
 			'contrastRatio' => [
 				'property' => 'contrastRatio',
 				'type' => 'enum',
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,5 +19,5 @@ function getUpdates23_12_01(): array { @@
     				'UPDATE overdrive_settings SET runFullUpdate = 1',
     			]
     		], //force_overdrive_full_update
-        ];
+    	];
     }