Merge branch '24.05.10' into 24.06.00

PTFS-Europe · Jun 7, 2024 · f156568 · f156568
2 parents a7578d1 + bab6c58
commit f156568
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 3 deletions.
diff --git a/code/web/RecordDrivers/MarcRecordDriver.php b/code/web/RecordDrivers/MarcRecordDriver.php
@@ -1630,6 +1630,7 @@ public function getMoreDetailsOptions() {
 		$interface->assign('links', $links);
 		$interface->assign('show856LinksAsTab', $library->getGroupedWorkDisplaySettings()->show856LinksAsTab);
 		$interface->assign('showItemDueDates', $library->getGroupedWorkDisplaySettings()->showItemDueDates);
+		$interface->assign('showItemNotes', $library->getGroupedWorkDisplaySettings()->showItemNotes);
 
 		if ($library->getGroupedWorkDisplaySettings()->show856LinksAsTab && count($links) > 0) {
 			$moreDetailsOptions['links'] = [

diff --git a/code/web/interface/themes/responsive/Record/copiesTableHeader.tpl b/code/web/interface/themes/responsive/Record/copiesTableHeader.tpl
@@ -23,7 +23,7 @@
 		<th>
 			<strong><u>{translate text="Call Number" isPublicFacing=true}</u></strong>
 		</th>
-		{if !empty($hasNote)}
+		{if !empty($hasNote) && $showItemNotes}
 			<th>
 				<strong><u>{translate text="Note" isPublicFacing=true}</u></strong>
 			</th>

diff --git a/code/web/interface/themes/responsive/Record/copiesTableRow.tpl b/code/web/interface/themes/responsive/Record/copiesTableRow.tpl
@@ -32,7 +32,7 @@
 				{/foreach}
 			{/if}
 		</td>
-		{if !empty($hasNote)}
+		{if !empty($hasNote) && $showItemNotes}
 			<td>
 				{if !empty($holding.note)}{$holding.note}{/if}
 			</td>

diff --git a/code/web/release_notes/24.05.10.MD b/code/web/release_notes/24.05.10.MD
@@ -3,6 +3,15 @@
 - Update extracting records from Evolve to extract individual MARC records rather than updating individual items. (Ticket 125328) (*MDN*)
 - When processing records to reload, force the record to be updated from Evolve during the indexing process. (Ticket 125328) (*MDN*)
 
+### Record Display
+- Add a new setting to control if notes are displayed within item details. (Ticket 133369) (*MDN*)
+
+<div markdown="1" class="settings">
+
+#### New Settings
+- Catalog / Grouped Works > Grouped Work Display > Full Record Display > Show Item Notes
+</div>
+
 ### Sierra Updates
 - When loading phone numbers, load the primary phone number from the phone number with a type of p. (Ticket 126596) (*MDN*)
 - When loading phone numbers, load the "work" phone number from the phone number with a type of t. (Ticket 126596) (*MDN*)

diff --git a/code/web/sys/DBMaintenance/version_updates/24.05.10.php b/code/web/sys/DBMaintenance/version_updates/24.05.10.php
@@ -19,6 +19,14 @@ function getUpdates24_05_10(): array {
 				"ALTER TABLE library ADD allowPatronWorkPhoneNumberUpdates TINYINT(1) DEFAULT 1",
 				"UPDATE library set allowPatronWorkPhoneNumberUpdates = showWorkPhoneInProfile",
 			],
-		],
+		], //library_add_can_update_work_phone_number
+		'show_item_notes_in_copies' => [
+			'title' => 'Show Item Notes in Copies',
+			'description' => 'Allow control over if notes are displayed in copy details',
+			'continueOnError' => true,
+			'sql' => [
+				"ALTER TABLE grouped_work_display_settings ADD showItemNotes TINYINT(1) DEFAULT 1",
+			],
+		], //show_item_notes_in_copies
     ];
 }
diff --git a/code/web/sys/Grouping/GroupedWorkDisplaySetting.php b/code/web/sys/Grouping/GroupedWorkDisplaySetting.php
@@ -79,6 +79,7 @@ class GroupedWorkDisplaySetting extends DataObject {
 
 	//Item details
 	public $showItemDueDates;
+	public $showItemNotes;
 
 	private $_moreDetailsOptions;
 
@@ -606,6 +607,14 @@ static function getObjectStructure($context = ''): array {
 						'hideInLists' => true,
 						'default' => true,
 					],
+					'showItemNotes' => [
+						'property' => 'showItemNotes',
+						'type' => 'checkbox',
+						'label' => 'Show Item Notes',
+						'description' => 'Whether or notes for items are shown within the copy details if available.',
+						'hideInLists' => true,
+						'default' => true,
+					],
 					'showInMainDetails' => [
 						'property' => 'showInMainDetails',
 						'type' => 'multiSelect',