From e001d6c2dac297ac638cb92bc3cc9e827bb2b9b4 Mon Sep 17 00:00:00 2001 From: Katherine Perdue Date: Mon, 22 Jul 2024 12:19:15 -0400 Subject: [PATCH 1/3] Use natural sort for copies --- code/web/sys/Grouping/Manifestation.php | 4 ++-- code/web/sys/Grouping/Record.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/web/sys/Grouping/Manifestation.php b/code/web/sys/Grouping/Manifestation.php index d5be9c8bfd..37a63fbcd1 100644 --- a/code/web/sys/Grouping/Manifestation.php +++ b/code/web/sys/Grouping/Manifestation.php @@ -326,7 +326,7 @@ function getItemSummary() { foreach ($this->_variations as $variation) { $itemSummary = mergeItemSummary($itemSummary, $variation->getItemSummary()); } - ksort($itemSummary); + ksort($itemSummary, SORT_NATURAL); $this->_itemSummary = $itemSummary; $timer->logTime("Got item summary for manifestation"); } @@ -345,7 +345,7 @@ function getItemsDisplayedByDefault() { $itemsDisplayedByDefault = mergeItemSummary($itemsDisplayedByDefault, $variation->getItemsDisplayedByDefault()); } } - ksort($itemsDisplayedByDefault); + ksort($itemsDisplayedByDefault, SORT_NATURAL); $this->_itemsDisplayedByDefault = $itemsDisplayedByDefault; } return $this->_itemsDisplayedByDefault; diff --git a/code/web/sys/Grouping/Record.php b/code/web/sys/Grouping/Record.php index 893d140b48..336caad1e4 100644 --- a/code/web/sys/Grouping/Record.php +++ b/code/web/sys/Grouping/Record.php @@ -470,7 +470,7 @@ public function addItemSummary($variationId, $key, $itemSummaryInfo, $groupedSta } public function sortItemSummary($variationId): void { - ksort($this->_itemSummary[$variationId]); + ksort($this->_itemSummary[$variationId], SORT_NATURAL); } /** @@ -534,7 +534,7 @@ public function addItemDetails($variationId, $key, $itemSummaryInfo): void { } public function sortItemDetails($variationId): void { - ksort($this->_itemDetails[$variationId]); + ksort($this->_itemDetails[$variationId], SORT_NATURAL); } /** From e70b8ffb6c474d51fc348fcaedc597a291011d3e Mon Sep 17 00:00:00 2001 From: Katherine Perdue Date: Wed, 24 Jul 2024 10:17:23 -0400 Subject: [PATCH 2/3] Updated release notes --- code/web/release_notes/24.08.00.MD | 1 + 1 file changed, 1 insertion(+) diff --git a/code/web/release_notes/24.08.00.MD b/code/web/release_notes/24.08.00.MD index 9ec58b073f..6be9b352f8 100644 --- a/code/web/release_notes/24.08.00.MD +++ b/code/web/release_notes/24.08.00.MD @@ -29,6 +29,7 @@ // katherine ### Other Updates - Fixed bug with unexpected 404 errors on Web Builder pages. (Ticket 123122) (*KP*) +- Sort volume numbers correctly. (Ticket 133280) (*KP*) ### cloudLibrary Updates - Add the ability to use alternate library cards (such as state library cards) with cloudLibrary (Ticket 69336, 133101) (*KP*) From ced5b1e35ab478891a5a266391499063f42c3218 Mon Sep 17 00:00:00 2001 From: Katherine Perdue Date: Mon, 29 Jul 2024 17:36:06 -0400 Subject: [PATCH 3/3] Add missing parameters for cloudLibrary automatic login --- code/web/Drivers/CloudLibraryDriver.php | 3 +++ code/web/release_notes/24.08.00.MD | 1 + 2 files changed, 4 insertions(+) diff --git a/code/web/Drivers/CloudLibraryDriver.php b/code/web/Drivers/CloudLibraryDriver.php index ebc0de9bc8..8e761190dc 100644 --- a/code/web/Drivers/CloudLibraryDriver.php +++ b/code/web/Drivers/CloudLibraryDriver.php @@ -943,6 +943,9 @@ public function redirectToCloudLibrary(User $patron, CloudLibraryRecordDriver $r $postParams = [ 'username' => $this->getPatronId($patron), 'password' => $this->getCloudLibraryPasswordOrPin($patron), + 'eula' => 'eula', + 'login_form' => 'true', + 'library_id' => $settings->accountId, ]; $curlWrapper = new CurlWrapper(); $headers = [ diff --git a/code/web/release_notes/24.08.00.MD b/code/web/release_notes/24.08.00.MD index c96ae49084..2f7c651cea 100644 --- a/code/web/release_notes/24.08.00.MD +++ b/code/web/release_notes/24.08.00.MD @@ -66,6 +66,7 @@ ### cloudLibrary Updates - Add the ability to use alternate library cards (such as state library cards) with cloudLibrary. (Ticket 69336, 133101) (*KP*) +- Fix automatic login for Open in cloudLibrary button. (*KP*) ### Search Updates - Fix bug where call number searches were not returning expected results. (Ticket 135530) (*KP*)