Merge branch '25.01.01' into 25.02.00

Author: mdnoble73

code/web/interface/themes/responsive/Record/hold-popup.tpl

@@ -54,13 +54,13 @@
 						{/foreach}
 					{/if}
 					{assign var="onlyOnePickupSublocation" value=false}
-					{if count($pickupSublocations) == 1}
-						{foreach from=$pickupSublocations item=firstSublocation}
-							{if !is_string($firstSublocation) && ($firstSublocation->code == $user->getPickupSublocationCode())}
-								{assign var="onlyOnePickupSublocation" value=true}
-							{/if}
-						{/foreach}
-					{/if}
+{*					{if count($pickupSublocations) == 1}*}
+{*						{foreach from=$pickupSublocations item=firstSublocation}*}
+{*							{if !is_string($firstSublocation) && ($firstSublocation->code == $user->getPickupSublocationCode())}*}
+{*								{assign var="onlyOnePickupSublocation" value=true}*}
+{*							{/if}*}
+{*						{/foreach}*}
+{*					{/if}*}
 					{if ($rememberHoldPickupLocation && $allowRememberPickupLocation) || $onlyOnePickupLocation}
 						<input type="hidden" name="pickupBranch" id="pickupBranch" value="{$user->getPickupLocationCode()}">
 						{if ($rememberHoldPickupLocation && $allowRememberPickupLocation)}
@@ -69,9 +69,9 @@
 							<input type="hidden" name="rememberHoldPickupLocation" id="rememberHoldPickupLocation" value="off">
 						{/if}
 
-						{if $onlyOnePickupSublocation}
-							<input type="hidden" name="pickupSublocation" id="pickupSublocation" value="{$user->getPickupSublocationCode()}">
-						{/if}
+{*						{if $onlyOnePickupSublocation}*}
+{*							<input type="hidden" name="pickupSublocation" id="pickupSublocation" value="{$user->getPickupSublocationCode()}">*}
+{*						{/if}*}
 						<input type="hidden" name="user" id="user" value="{$user->id}">
 					{else}
 						<div id="pickupLocationOptions" class="form-group">

code/web/release_notes/25.01.01.MD

@@ -1,4 +1,7 @@
 ## Aspen Discovery Updates
+### Hold Updates
+- Correctly show the hold popup if only one pickup location is available after sublocation changes. (DIS-46) (*MDN*)
+
 ### Local ILL Updates
 - Do not allow placing local ILL requests for specific volumes within Symphony since Symphony does not properly select the correct volume. (DIS-34) (*MDN*)  
 

code/web/services/Record/AJAX.php

@@ -1032,10 +1032,11 @@ function placeHold(): array {
 										require_once ROOT_DIR . '/sys/ILS/IlsVolumeInfo.php';
 										$volumeDataDB = new IlsVolumeInfo();
 										$volumeDataDB->volumeId = $_REQUEST['volume'];
+										$volumeInfo = $_REQUEST['volume'];
 										if ($volumeDataDB->find(true)) {
 											$volumeLabel = $volumeDataDB->displayLabel;
 										} else {
-											$volumeInfo = $_REQUEST['volume'];
+											$volumeLabel = $_REQUEST['volume'];
 										}
 									}