From 5ef5ae38984e03220462752e1f07b01795f5c075 Mon Sep 17 00:00:00 2001
From: Mark Noble <mdnoble73@gmail.com>
Date: Mon, 9 Dec 2024 15:41:02 -0700
Subject: [PATCH] Fix linking to library websites for consortia within Web
 Builder and the Hours and Location dialog

---
 .../AJAX/libraryHoursAndLocations.tpl         | 36 +++++++++----------
 code/web/release_notes/25.01.00.MD            |  4 ++-
 code/web/services/AJAX/JSON.php               |  5 +--
 code/web/services/WebBuilder/AJAX.php         |  3 +-
 4 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/code/web/interface/themes/responsive/AJAX/libraryHoursAndLocations.tpl b/code/web/interface/themes/responsive/AJAX/libraryHoursAndLocations.tpl
index 49f78c005a..de9a53efc3 100644
--- a/code/web/interface/themes/responsive/AJAX/libraryHoursAndLocations.tpl
+++ b/code/web/interface/themes/responsive/AJAX/libraryHoursAndLocations.tpl
@@ -20,25 +20,25 @@
 					<div style="flex-grow: 1; max-width: 300px">
 						<img src="{$curLocation.image}" alt="{$curLocation.name}" class="img-responsive"/>
 					</div>
-                {/if}
+				{/if}
 				<div style="flex-grow: 1">
 					<h2 style="margin-top:0; padding-top: 0">{$curLocation.name}</h2>
-					<address style="text-wrap: normal; word-break: break-all; word-wrap: break-word;">
-                        {if !empty($curLocation.address)}
+					<address style="text-wrap: wrap; word-break: break-all; word-wrap: break-word;">
+						{if !empty($curLocation.address)}
 							{$curLocation.address}<br/>
 						{/if}
-                        {if !empty($curLocation.phone)}
+						{if !empty($curLocation.phone)}
 							<span>{translate text="Phone" isPublicFacing=true}:</span>&nbsp;<a href="tel:{$curLocation.phone}">{$curLocation.phone}</a><br/>
-                        {/if}
-                        {if !empty($curLocation.secondaryPhoneNumber)}
+						{/if}
+						{if !empty($curLocation.secondaryPhoneNumber)}
 							<span>{translate text="Secondary Phone" isPublicFacing=true}:</span>&nbsp;<a href="tel:{$curLocation.secondaryPhoneNumber}">{$curLocation.secondaryPhoneNumber}</a><br/>
-                        {/if}
-                        {if !empty($curLocation.tty)}
+						{/if}
+						{if !empty($curLocation.tty)}
 							<span>{translate text="TTY" isPublicFacing=true}:</span>&nbsp;<a href="tel:{$curLocation.tty}">{$curLocation.tty}</a><br/>
-                        {/if}
-                        {if !empty($curLocation.email)}
+						{/if}
+						{if !empty($curLocation.email)}
 							<span>{translate text="Email" isPublicFacing=true}:</span>&nbsp;<a href="mailto:{$curLocation.email}">{$curLocation.email}</a>
-                        {/if}
+						{/if}
 					</address>
 					{if !empty($curLocation.hoursMessage)}
 						<span class="label label-info" style="font-size: revert; white-space: normal">{$curLocation.hoursMessage}</span>
@@ -49,22 +49,22 @@
 			<div class="row" style="padding-top: 1em">
 				<div class="col-xs-12">
 					<div style="width: 100%; display: inline-flex; flex-direction: row; justify-content: space-around; flex-wrap: wrap; gap: 1rem">
-		                {if !empty($curLocation.map_link)}
+						{if !empty($curLocation.map_link)}
 							<a class="btn btn-default btn-lg" style="flex-grow: 1" href="{$curLocation.map_link}" role="button"><i class="fas fa-directions" role="presentation"></i> {translate text="Visit Library" isPublicFacing=true}</a>
 						{/if}
-	                    {if !empty($curLocation.phone)}
-		                    <a class="btn btn-default btn-lg" style="flex-grow: 1" href="tel:{$curLocation.phone}" role="button"><i class="fas fa-phone" role="presentation"></i> {translate text="Call Library" isPublicFacing=true}</a>
+						{if !empty($curLocation.phone)}
+							<a class="btn btn-default btn-lg" style="flex-grow: 1" href="tel:{$curLocation.phone}" role="button"><i class="fas fa-phone" role="presentation"></i> {translate text="Call Library" isPublicFacing=true}</a>
 						{/if}
-                        {if !empty($curLocation.email)}
+						{if !empty($curLocation.email)}
 							<a class="btn btn-default btn-lg" style="flex-grow: 1" href="mailto:{$curLocation.email}" role="button"><i class="fas fa-envelope" role="presentation"></i> {translate text="Email Library" isPublicFacing=true}</a>
 						{/if}
-                        {if !empty($curLocation.homeLink)}
+						{if !empty($curLocation.homeLink)}
 							<a class="btn btn-default btn-lg" style="flex-grow: 1" href="{$curLocation.homeLink}" role="button" target="_blank" aria-label="{translate text="Visit Website" isPublicFacing=true inAttribute=true} ({translate text="opens in a new window" isPublicFacing=true inAttribute=true})"><i class="fas fa-external-link-alt" role="presentation"></i> {translate text="Visit Website" isPublicFacing=true}</a>
 						{/if}
 					</div>
 				</div>
 			</div>
-            {/if}
+			{/if}
 
 			<div class="row" style="width: 100%; display: inline-flex; flex-direction: row; justify-content: stretch; flex-wrap: wrap; gap: 1rem">
 			{if !empty($curLocation.hasValidHours)}
@@ -107,7 +107,7 @@
 				{/foreach}
 				</div>
 			{/if}
-                {if !empty($curLocation.latitude) && $curLocation.latitude !== 0}
+				{if !empty($curLocation.latitude) && $curLocation.latitude !== 0}
 				<div style="flex-grow: 1; flex-basis: 300px; flex-shrink: 0; justify-self: stretch">
 					<iframe
 							width="100%"
diff --git a/code/web/release_notes/25.01.00.MD b/code/web/release_notes/25.01.00.MD
index e701b775e0..5ef6999860 100644
--- a/code/web/release_notes/25.01.00.MD
+++ b/code/web/release_notes/25.01.00.MD
@@ -2,6 +2,8 @@
 
 ## Aspen Discovery Updates
 //mark 
+### Other Updates
+- Fix linking to library websites for consortia within Web Builder and the Hours and Location dialog. (*MDN*)
 
 //katherine
 
@@ -52,4 +54,4 @@
 - 
 
 ## This release includes sponsored developments from
-- 
\ No newline at end of file
+- Milwaukee County Federated Library System
diff --git a/code/web/services/AJAX/JSON.php b/code/web/services/AJAX/JSON.php
index 1a02114a80..82aa820533 100644
--- a/code/web/services/AJAX/JSON.php
+++ b/code/web/services/AJAX/JSON.php
@@ -394,7 +394,7 @@ protected function output($data, $status) {
 	}
 
 	/** @noinspection PhpUnused */
-	function getHoursAndLocations() {
+	function getHoursAndLocations() : string {
 		//Get a list of locations for the current library
 		global $library;
 		global $configArray;
@@ -475,6 +475,7 @@ function getHoursAndLocations() {
 				}
 				$hours[$key] = $hourObj;
 			}
+			$parentLibrary = $locationToProcess->parentLibrary;
 			$libraryLocation = [
 				'id' => $locationToProcess->locationId,
 				'name' => $locationToProcess->displayName,
@@ -489,7 +490,7 @@ function getHoursAndLocations() {
 				'image' => $locationToProcess->locationImage ? $configArray['Site']['url'] . '/files/original/' . $locationToProcess->locationImage : null,
 				'longitude' => floatval($locationToProcess->longitude),
 				'latitude' => floatval($locationToProcess->latitude),
-				'homeLink' => !empty($library->homeLink) ? $library->homeLink : null,
+				'homeLink' => (!empty($locationToProcess->homeLink) && $locationToProcess->homeLink !== 'default') ? $locationToProcess->homeLink : ((!empty($parentLibrary->homeLink) && $parentLibrary->homeLink !== 'default') ? $parentLibrary->homeLink : null),
 				'hoursMessage' => Location::getLibraryHoursMessage($locationToProcess->locationId, true),
 			];
 
diff --git a/code/web/services/WebBuilder/AJAX.php b/code/web/services/WebBuilder/AJAX.php
index 35fa3381b0..f4d1010873 100644
--- a/code/web/services/WebBuilder/AJAX.php
+++ b/code/web/services/WebBuilder/AJAX.php
@@ -821,6 +821,7 @@ function getHoursAndLocations() {
 				}
 				$hours[$key] = $hourObj;
 			}
+			$parentLibrary = $locationToProcess->getParentLibrary();
 			$libraryLocation = [
 				'id' => $locationToProcess->locationId,
 				'name' => $locationToProcess->displayName,
@@ -835,7 +836,7 @@ function getHoursAndLocations() {
 				'image' => $locationToProcess->locationImage ? $configArray['Site']['url'] . '/files/original/' . $locationToProcess->locationImage : null,
 				'longitude' => floatval($locationToProcess->longitude),
 				'latitude' => floatval($locationToProcess->latitude),
-				'homeLink' => !empty($library->homeLink) ? $library->homeLink : null,
+				'homeLink' => (!empty($locationToProcess->homeLink) && $locationToProcess->homeLink !== 'default') ? $locationToProcess->homeLink : ((!empty($parentLibrary->homeLink) && $parentLibrary->homeLink !== 'default') ? $parentLibrary->homeLink : null),
 				'hoursMessage' => Location::getLibraryHoursMessage($locationToProcess->locationId, true),
 			];