Merge pull request Aspen-Discovery#1932 from Abhyastamita/24.08.00

Sort volume numbers correctly
PTFS-Europe · Jul 29, 2024 · 1981fed · 1981fed
2 parents f822f98 + ced5b1e
commit 1981fed
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git 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
@@ -75,9 +75,11 @@
 // katherine
 ### Other Updates
 - Fix 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*)
+- 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*)

diff --git 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
@@ -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);
 	}
 
 	/**