Merge branch 'Aspen-Discovery:24.11.00' into 24.11.00

code/web/cron/createDefaultDatabaseScript.php

@@ -94,9 +94,13 @@
 	(18, 'Unavailable', 0, 1, 'This e-mail is to let you know the status of your recent request for an item that you did not find in our catalog. The item you requested cannot be purchased at this time from any of our regular suppliers and is not available from any of our lending libraries.', 0, 0, -1, 0, 0, 0, 0),
 	(19, 'Cancelled by Patron', 0, 0, '', 0, 1, -1, 0, 0, 0, 0),
 	(20, 'Cancelled - Duplicate Request', 0, 0, '', 0, 0, -1, 0, 0, 0, 0),
-	(21, 'Hold Placed', 0, 1, '0', 0, 0, -1, 0, 1, 0, 0),
-	(22, 'Hold Failed', 0, 1, '0', 0, 0, -1, 0, 0, 1, 0),
-	(23, 'Hold Not Needed', 0, 1, '0', 0, 0, -1, 0, 0, 0, 1);\n");
+	(21, 'Hold Placed', 0, 1, '{title} has been received by the library and you have been added to the hold queue. 
+
+Thank you for your purchase suggestion!', 0, 0, -1, 0, 1, 0, 0),
+	(22, 'Hold Failed', 0, 1, '{title} has been received by the library, however we were not able to add you to the hold queue. Please ensure that your account is in good standing and then visit our catalog to place your hold.
+
+	Thanks', 0, 0, -1, 0, 0, 1, 0),
+	(23, 'Hold Not Needed', 0, 0, '', 0, 0, -1, 0, 0, 0, 1);\n");
 /** @noinspection SqlWithoutWhere */
 fwrite($fhnd, "UPDATE modules set enabled=0;UPDATE modules set enabled=1 where name in ('Side Loads', 'User Lists');\n");
 fwrite($fhnd, "INSERT INTO system_variables (currencyCode, storeRecordDetailsInSolr, storeRecordDetailsInDatabase, indexVersion, searchVersion, appScheme, trackIpAddresses) VALUES ('USD', 0, 1, 2, 2, 'aspen-lida', 0); \n");

code/web/release_notes/24.10.01.MD

@@ -0,0 +1,7 @@
+## Aspen Discovery Updates
+### Other updates
+- Correct creating default materials request statuses. (*MDN*)
+
+## This release includes code contributions from
+- Grove For Libraries
+    - Mark Noble (MDN)

code/web/sys/DBMaintenance/version_updates/24.10.00.php

@@ -111,13 +111,13 @@ function getUpdates24_10_00(): array {
 			'sql' => [
 				"UPDATE materials_request_status SET isOpen = 1, checkForHolds = 1 where description='Item purchased' and libraryId = -1",
 				"INSERT INTO materials_request_status (description, sendEmailToPatron, emailTemplate, isOpen, isPatronCancel, holdPlacedSuccessfully, libraryId) 
-					VALUES ('Hold Placed', 1, 0, '{title} has been received by the library and you have been added to the hold queue. 
+					VALUES ('Hold Placed', 1, '{title} has been received by the library and you have been added to the hold queue. 
 
-Thank you for your purchase suggestion!', 0, 1, -1)",
+Thank you for your purchase suggestion!', 0, 0, 1, -1)",
 				"INSERT INTO materials_request_status (description, sendEmailToPatron, emailTemplate, isOpen, isPatronCancel, holdFailed, libraryId) 
-					VALUES ('Hold Failed', 1, 0, '{title} has been received by the library, however we were not able to add you to the hold queue. Please ensure that your account is in good standing and then visit our catalog to place your hold.
+					VALUES ('Hold Failed', 1, '{title} has been received by the library, however we were not able to add you to the hold queue. Please ensure that your account is in good standing and then visit our catalog to place your hold.
 
-	Thanks', 0, 1, -1)",
+	Thanks', 0, 0, 1, -1)",
 			]
 		], //update_default_request_statuses
 		'update_default_request_statuses_2' => [
@@ -126,7 +126,7 @@ function getUpdates24_10_00(): array {
 			'continueOnError' => false,
 			'sql' => [
 				"INSERT INTO materials_request_status (description, sendEmailToPatron, emailTemplate, isOpen, isPatronCancel, holdNotNeeded, libraryId) 
-					VALUES ('Hold Not Needed', 1, 0, '', 0, 1, -1)",
+					VALUES ('Hold Not Needed', 0, '', 0, 0, 1, -1)",
 			]
 		], //update_default_request_statuses_2
 		'materials_request_hold_candidate_generation_log' => [
@@ -288,4 +288,4 @@ function getUpdates24_10_00(): array {
 		//other
 
 	];
-}
+}

code/web/sys/SearchObject/EbscoEdsSearcher.php

@@ -558,7 +558,7 @@ public function processSearch($returnIndexErrors = false, $recommendations = fal
 		if (empty($isAuthenticated)) {
 			return null;
 		}
-		if (get_class($isAuthenticated) == 'AspenError') {
+		if (is_object($isAuthenticated) && get_class($isAuthenticated) == 'AspenError') {
 			return $isAuthenticated;
 		}
 
@@ -907,4 +907,4 @@ public function getResearchStarters($searchTerm = null) {
 
 		return $researchStarters;
 	}
-}
+}

install/aspen.sql

@@ -6848,9 +6848,13 @@ INSERT INTO `materials_request_status` (`id`, `description`, `isDefault`, `sendE
 	(18, 'Unavailable', 0, 1, 'This e-mail is to let you know the status of your recent request for an item that you did not find in our catalog. The item you requested cannot be purchased at this time from any of our regular suppliers and is not available from any of our lending libraries.', 0, 0, -1, 0, 0, 0, 0),
 	(19, 'Cancelled by Patron', 0, 0, '', 0, 1, -1, 0, 0, 0, 0),
 	(20, 'Cancelled - Duplicate Request', 0, 0, '', 0, 0, -1, 0, 0, 0, 0),
-	(21, 'Hold Placed', 0, 1, '0', 0, 0, -1, 0, 1, 0, 0),
-	(22, 'Hold Failed', 0, 1, '0', 0, 0, -1, 0, 0, 1, 0),
-	(23, 'Hold Not Needed', 0, 1, '0', 0, 0, -1, 0, 0, 0, 1);
+	(21, 'Hold Placed', 0, 1, '{title} has been received by the library and you have been added to the hold queue.
+
+Thank you for your purchase suggestion!', 0, 0, -1, 0, 1, 0, 0),
+	(22, 'Hold Failed', 0, 1, '{title} has been received by the library, however we were not able to add you to the hold queue. Please ensure that your account is in good standing and then visit our catalog to place your hold.
+
+	Thanks', 0, 0, -1, 0, 0, 1, 0),
+	(23, 'Hold Not Needed', 0, 0, '', 0, 0, -1, 0, 0, 0, 1);
 UPDATE modules set enabled=0;UPDATE modules set enabled=1 where name in ('Side Loads', 'User Lists');
 INSERT INTO system_variables (currencyCode, storeRecordDetailsInSolr, storeRecordDetailsInDatabase, indexVersion, searchVersion, appScheme, trackIpAddresses) VALUES ('USD', 0, 1, 2, 2, 'aspen-lida', 0); 
 INSERT INTO themes