Merge branch '24.04.00' into 24.05.00

PTFS-Europe · Apr 12, 2024 · 9be1f3a · 9be1f3a
2 parents 4c2d0a7 + dddd54c
commit 9be1f3a
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 deletions.
diff --git a/code/web/Drivers/PalaceProjectDriver.php b/code/web/Drivers/PalaceProjectDriver.php
@@ -379,7 +379,7 @@ function placeHold($patron, $recordId, $pickupBranch = null, $cancelDate = null)
 			$this->initCurlWrapper();
 			$this->curlWrapper->addCustomHeaders($headers, true);
 			$response = $this->curlWrapper->curlGetPage($borrowLink);
-			ExternalRequestLogEntry::logRequest('palaceProject.checkoutTitle', 'POST', $borrowLink, $this->curlWrapper->getHeaders(), false, $this->curlWrapper->getResponseCode(), $response, []);
+			ExternalRequestLogEntry::logRequest('palaceProject.placeHold', 'POST', $borrowLink, $this->curlWrapper->getHeaders(), false, $this->curlWrapper->getResponseCode(), $response, []);
 			if ($response != false) {
 				$jsonResponse = json_decode($response);
 				if ($jsonResponse == false) {

diff --git a/code/web/release_notes/24.04.00.MD b/code/web/release_notes/24.04.00.MD
@@ -160,6 +160,7 @@
 - Correct message when no holds can be frozen or thawed to show the proper alert style. (Ticket 127582) (*MDN*)
 - Updates to checking the status of User List and Side Loads indexing. (*MDN*)
 - Update so Custom CSS and JavaScript can be turned off with noCustom, noCustomCSS, or noCustomJavaScript rather than requiring a combination of parameters. (*MDN*) 
+- Fix notice changing language when logged out if a library only has a single theme for it. (*MDN*)
 
 ## This release includes code contributions from
 - ByWater Solutions

diff --git a/code/web/services/AJAX/JSON.php b/code/web/services/AJAX/JSON.php
@@ -616,9 +616,11 @@ function updateDisplaySettings() {
 		}
 
 		$activeThemeId = $interface->getVariable('activeThemeId');
-		$preferredTheme = strip_tags($_REQUEST['preferredTheme']);
-		if ($activeThemeId != $preferredTheme) {
-			$_SESSION['preferredTheme'] = $preferredTheme;
+		if (isset($_REQUEST['preferredTheme'])) {
+			$preferredTheme = strip_tags($_REQUEST['preferredTheme']);
+			if ($activeThemeId != $preferredTheme) {
+				$_SESSION['preferredTheme'] = $preferredTheme;
+			}
 		}
 
 		return [

diff --git a/code/web/sys/Grouping/GroupedWorkDisplaySetting.php b/code/web/sys/Grouping/GroupedWorkDisplaySetting.php
@@ -689,8 +689,12 @@ public function fetch() {
 			if (isset($this->showInSearchResultsMainDetails) && is_string($this->showInSearchResultsMainDetails) && !empty($this->showInSearchResultsMainDetails)) {
 				// convert to array retrieving from database
 				$unSerialized = unserialize($this->showInSearchResultsMainDetails);
-				$this->showInSearchResultsMainDetails = array_combine($unSerialized, $unSerialized);
-				if (!$this->showInSearchResultsMainDetails) {
+				if (!empty($unSerialized)) {
+					$this->showInSearchResultsMainDetails = array_combine($unSerialized, $unSerialized);
+					if (!$this->showInSearchResultsMainDetails) {
+						$this->showInSearchResultsMainDetails = [];
+					}
+				}else{
 					$this->showInSearchResultsMainDetails = [];
 				}
 			}
@@ -699,8 +703,12 @@ public function fetch() {
 				// convert to array retrieving from database
 				try {
 					$unSerialized = unserialize($this->showInMainDetails);
-					$this->showInMainDetails = array_combine($unSerialized, $unSerialized);
-					if (!$this->showInMainDetails) {
+					if (!empty($unSerialized)) {
+						$this->showInMainDetails = array_combine($unSerialized, $unSerialized);
+						if (!$this->showInMainDetails) {
+							$this->showInMainDetails = [];
+						}
+					}else{
 						$this->showInMainDetails = [];
 					}
 				} catch (Exception $e) {

diff --git a/code/web/sys/LibraryLocation/Library.php b/code/web/sys/LibraryLocation/Library.php
@@ -2906,6 +2906,7 @@ static function getObjectStructure($context = ''): array {
 								'description' => 'A list of library codes that you would like included in the available at facet separated by pipes |.',
 								'size' => '20',
 								'hideInLists' => true,
+								'forcesReindex' => true,
 							],
 						],
 					],