Merge branch '24.06.00' into 24.07.00

code/reindexer/src/org/aspen_discovery/reindexer/KohaRecordProcessor.java

@@ -168,7 +168,7 @@ private float getKohaVersion(Connection kohaConn){
 
 	@Override
 	protected boolean isItemAvailable(ItemInfo itemInfo, String displayStatus, String groupedStatus) {
-		return !inTransitItems.contains(itemInfo.getItemIdentifier()) && displayStatus.equals("On Shelf") || (settings.getTreatLibraryUseOnlyGroupedStatusesAsAvailable() && groupedStatus.equals("Library Use Only"));
+		return !inTransitItems.contains(itemInfo.getItemIdentifier()) && groupedStatus.equals("On Shelf") || (settings.getTreatLibraryUseOnlyGroupedStatusesAsAvailable() && groupedStatus.equals("Library Use Only"));
 	}
 
 	private final HashSet<String> additionalStatuses = new HashSet<>();

code/web/Drivers/Sierra.php

@@ -835,9 +835,9 @@ function freezeHold($patron, $recordId, $itemToFreezeId, $dateToReactivate): arr
 			];
 		} else {
 			$return = [
-				'success' => true,
+				'success' => false,
 				'message' => translate([
-					'text' => "Unable to freeze your hold.",
+					'text' => 'Unable to freeze your hold.',
 					'isPublicFacing' => true,
 				]),
 				'api' => [

code/web/cron/importAspenBackup.php

@@ -25,16 +25,17 @@
 			if (strpos($exportFile, ".sql") > 0 && strpos($exportFile, 'mysql') === false) {
 				// Trimming the first two lines of the file
 				$filePath = $sqlBackupDir . $exportFile;
-				$fileContents = file($filePath);
-				if ($fileContents !== false) {
-					if ($fileContents[0] == "/*!999999\- enable the sandbox mode */\n"){
-						$trimmedContents = array_slice($fileContents, 1);
-						file_put_contents($filePath, implode("", $trimmedContents));
-					}
-				}
+				$fhnd = fopen($filePath, 'r');
+				$line = fgets($fhnd);
+				fclose($fhnd);
 
 				echo("Importing $exportFile\n");
-				$importCommand = "mysql -u$dbUser -p$dbPassword -h$dbHost -P$dbPort $dbName < $sqlBackupDir$exportFile ";
+				if (strpos($line, "/*!999999\- enable the sandbox mode") === 0){
+					$importCommand = "mysql -u$dbUser -p$dbPassword -h$dbHost -P$dbPort -D $dbName --force < $sqlBackupDir$exportFile";
+				}else{
+					$importCommand = "mysql -u$dbUser -p$dbPassword -h$dbHost -P$dbPort $dbName < $sqlBackupDir$exportFile ";
+				}
+
 				$results = [];
 				exec($importCommand, $results);
 				echo(implode("\n", $results));

code/web/release_notes/24.05.02.MD

@@ -6,7 +6,10 @@
 - Correct indexing Polaris Items when new items are found that have not been indexed previously. (*MDN*)
 
 ### Symphony Updates
-- Immediately delete MARC files after they have been processed. (Ticket 128804) (*MDN*) 
+- Immediately delete MARC files after they have been processed. (Ticket 128804) (*MDN*)
+
+### Other Updates
+- Update import script to ignore sandbox mode if not available. (*MDN*)
 
 ## This release includes code contributions from
 - ByWater Solutions

code/web/release_notes/24.06.00.MD

@@ -90,6 +90,7 @@
 - Translate error messages while performing self registration. (Ticket 133351) (*MDN*)
 - If a patron has an extended attribute of SHOUTBOMB, show that attribute on the messaging preferences page in addition to showing it on the contact information page. (Ticket 128982) (*MDN*)
 - Show a blank value for Koha extended attributes if they are not required, and they are linked to an authorised value. (Ticket 128982) (*MDN*)
+- Show the correct availability for titles when the default available status is not set to On Shelf. (Ticket 132534) (*MDN*)
 
 ### Location Updates
 - Fixed a bug where updating coordinates required two saves to properly store the values from the Google API. (*KK*)
@@ -127,6 +128,8 @@
 - When linking to ILS course reserves, use the Vendor Opac Url in the Account Profile rather than the URL in config.ini. (Ticket 131388) (*MDN*)
 - When using the "Pickup at" setting within the Format Map, properly load available locations when the location code is not the entire location code of the item. (Tickets 128864, 130706) (*MDN*)
 - Add additional handling for looking up titles for holds and checkouts if the item id cannot be found in Aspen. (Ticket 130159) (*MDN*)
+- When freezing selected or all holds, do not show a prompt for reactivation date. (Tickets 133197, 131688) (*MDN*)
+- When freezing holds, make sure that success and error messages show appropriately. (Ticket 127582) (*MDN*)
 - Create a new Under Consideration status that can be used for order items that the library has not committed to purchase. (Ticket 128096) (*MDN*) 
   - Libraries can select which status code is used to generate the new status. 
   - Titles with a status of Under Consideration will be displayed after all titles that are On Order or that have been previously purchased when sorting by Date Purchased. 

code/web/services/MyAccount/AJAX.php

@@ -969,6 +969,13 @@ function freezeHold(): array {
 							'text' => 'Success',
 							'isPublicFacing' => true,
 						]);
+					}else{
+						$message = '<div class="alert alert-danger">' . $result['message'] . '</div>';
+						$result['message'] = $message;
+						$result['title'] = translate([
+							'text' => 'Error',
+							'isPublicFacing' => true,
+						]);
 					}
 
 					if (!$result['success'] && is_array($result['message'])) {
@@ -1006,6 +1013,9 @@ function confirmFreezeHoldSelected(): array {
 		]);
 
 		$promptForReactivationDate = $_REQUEST['reactivationDate'] ?? false;
+		if ($promptForReactivationDate === "false") {
+			$promptForReactivationDate = false;
+		}
 
 		if($promptForReactivationDate) {
 			global $interface;
@@ -1168,6 +1178,9 @@ function confirmFreezeHoldAll(): array {
 		]);
 
 		$promptForReactivationDate = $_REQUEST['reactivationDate'] ?? false;
+		if ($promptForReactivationDate === "false") {
+			$promptForReactivationDate = false;
+		}
 
 		if($promptForReactivationDate) {
 			global $interface;