Merge branch '24.06.00' of https://github.com/Aspen-Discovery/aspen-d…

…iscovery into 24.06.00

code/web/interface/themes/responsive/ILS/ilsExtractLog.tpl

@@ -2,7 +2,7 @@
 	<div id="main-content" class="col-md-12">
 		<h1>{translate text="ILS Export Log" isAdminFacing=true}</h1>
 		<p class="alert alert-info">
-			{translate text="The ILS Export log shows records extraction of MARC records from the ILS.  For most ILSs, this is done on a continuous basis as we detect changes within the ILS. A full extract can be done by selecting <b>Run Full Update</b> within the Indexing Profile." isAdminFacing=true}
+			{translate text="The ILS Export log shows MARC records extracted from the ILS.  For most ILSs, this is done on a continuous basis as we detect changes within the ILS. A full extract can be done by selecting <b>Run Full Update</b> within the Indexing Profile." isAdminFacing=true}
 		</p>
 
         {include file='Admin/exportLogFilters.tpl'}

code/web/release_notes/24.06.00.MD

@@ -35,14 +35,23 @@
 //kirstien
 
 //kodi
+### EDS Updates
+- Add toggle for defaulting "Full Text" Limiter on/off (Ticket 129247) (*KL*)
+
+### Searching Updates
+- Fixed issue where multiselect facets were not allowing multiple values to be selected when searching (Tickets 131841, 131923) (*KL, MDN*)
 
 
 //other
 
+//morgan 
+- Added new Documentation links to several settings pages (*MKD*)
+- Updates to default user roles: removed testing roles and a couple uncommonly used roles; updated role titles (*MKD*)
 
 ## This release includes code contributions from
 - ByWater Solutions
   - Mark Noble (MDN)
-  - Kirstin Kroeger
+  - Kirstin Kroeger (KK)
   - Kodi Lein (KL)
   - Liz Rea (LR)
+  - Morgan Daigneault (MKD)

code/web/services/Admin/EmailTemplates.php

@@ -40,6 +40,10 @@ function getAllObjects($page, $recordsPerPage): array {
 		return $list;
 	}
 
+    function getInstructions() : string{
+        return 'https://help.aspendiscovery.org/email';
+    }
+
 	function getDefaultSort(): string {
 		return 'name asc';
 	}

code/web/services/Admin/JavaScriptSnippets.php

@@ -75,7 +75,7 @@ function getIdKeyColumn(): string {
 	}
 
 	function getInstructions(): string {
-		return '';
+		return 'https://help.aspendiscovery.org/customizewithcode';
 	}
 
 	function getBreadcrumbs(): array {

code/web/services/Admin/NonGroupedRecords.php

@@ -47,7 +47,7 @@ function getIdKeyColumn(): string {
 	}
 
 	function getInstructions(): string {
-		return '';
+		return 'https://help.aspendiscovery.org/grouping';
 	}
 
 	function getBreadcrumbs(): array {

code/web/services/Admin/PTypes.php

@@ -57,6 +57,10 @@ function getBreadcrumbs(): array {
 		return $breadcrumbs;
 	}
 
+    function getInstructions() : string{
+        return 'https://help.aspendiscovery.org/patrontypes';
+    }
+
 	function getActiveAdminSection(): string {
 		return 'primary_configuration';
 	}

code/web/services/Admin/TwoFactorAuth.php

@@ -82,6 +82,10 @@ function getBreadcrumbs(): array {
 		return $breadcrumbs;
 	}
 
+    function getInstructions() : string{
+        return 'https://help.aspendiscovery.org/help/users/account';
+    }
+
 	function getActiveAdminSection(): string {
 		return 'primary_configuration';
 	}

code/web/services/ILS/IndexingProfiles.php

@@ -111,7 +111,7 @@ function canDelete() {
 	}
 
 	function getInstructions(): string {
-		return '';
+		return 'https://help.aspendiscovery.org/ilsintegration';
 	}
 
 	function getAdditionalObjectActions($existingObject): array {

code/web/services/ILS/TranslationMaps.php

@@ -197,6 +197,10 @@ function getAdditionalObjectActions($existingObject): array {
 		return $actions;
 	}
 
+    function getInstructions(): string {
+        return 'https://help.aspendiscovery.org/ilsintegration';
+    }
+
 	function getBreadcrumbs(): array {
 		$breadcrumbs = [];
 		$breadcrumbs[] = new Breadcrumb('/Admin/Home', 'Administration Home');

code/web/services/SideLoads/Scopes.php

@@ -73,7 +73,7 @@ function getAdditionalObjectActions($existingObject): array {
 	}
 
 	function getInstructions(): string {
-		return '';
+		return 'https://help.aspendiscovery.org/help/integration/sideload';
 	}
 
 	/** @noinspection PhpUnused */

code/web/services/Translation/Translations.php

@@ -248,7 +248,7 @@ private function exportForBulkTranslation() {
 		exit();
 	}
 
-	function getBreadcrumbs(): array {
+    function getBreadcrumbs(): array {
 		$breadcrumbs = [];
 		$breadcrumbs[] = new Breadcrumb('/Admin/Home', 'Administration Home');
 		$breadcrumbs[] = new Breadcrumb('/Admin/Home#translations', 'Languages and Translations');

code/web/sys/Administration/Role.php

@@ -191,7 +191,7 @@ public function getDefaultPermissions() {
 					'Administer Permissions',
 					'Administer Users',
 				];
-			case 'libraryAdmin':
+			case 'Library Admin':
 				return [
 					'Administer Home Library Locations',
 					'Administer Home Library',
@@ -208,7 +208,7 @@ public function getDefaultPermissions() {
 					'View New York Times Lists',
 					'View Offline Holds Report',
 				];
-			case 'libraryManager':
+			case 'Library Manager':
 				return [
 					'Administer Home Library Locations',
 					'Administer Home Library',
@@ -217,25 +217,25 @@ public function getDefaultPermissions() {
 					'Block Patron Account Linking',
 					'View New York Times Lists',
 				];
-			case 'locationManager':
+			case 'Location Manager':
 				return [
 					'Administer Home Location',
 					'Administer Library Browse Categories',
 					'Administer Library Collection Spotlights',
 					'Block Patron Account Linking',
 				];
-			case 'translator':
-				return [
-					'Administer Languages',
-					'Translate Aspen',
-				];
-			case 'library_material_requests':
-				return [
-					'Administer Materials Requests',
-					'Manage Library Materials Requests',
-					'View Materials Requests Reports',
-				];
-			case 'superCataloger':
+            case 'Translator':
+                return [
+                    'Administer Languages',
+                    'Translate Aspen',
+                ];
+            case 'Aspen Materials Requests':
+                return [
+                    'Administer Materials Requests',
+                    'Manage Library Materials Requests',
+                    'View Materials Requests Reports',
+                ];
+			case 'Super Cataloger':
 				return [
 					'Administer Indexing Profiles',
 					'Administer Loan Rules',
@@ -254,7 +254,11 @@ public function getDefaultPermissions() {
 					'View ILS records in native Staff Client',
 					'View Indexing Logs',
 				];
-			case 'cataloging':
+            case 'Genealogy Contributor':
+                return [
+                    'Administer Genealogy',
+                ];
+			case 'Cataloging':
 				return [
 					'Administer Wikipedia Integration',
 					'Download MARC Records',
@@ -268,22 +272,14 @@ public function getDefaultPermissions() {
 					'View ILS records in native Staff Client',
 					'View Indexing Logs',
 				];
-			case 'circulationReports':
-				return [
-					'View Offline Holds Report',
-				];
-			case 'contentEditor':
+			case 'Content Editor':
 				return [
 					'Administer Library Browse Categories',
 					'Administer Library Collection Spotlights',
 					'Administer Library Placards',
 					'View New York Times Lists',
 				];
-			case 'genealogyContributor':
-				return [
-					'Administer Genealogy',
-				];
-			case 'listPublisher':
+			case 'List Publisher':
 				return [
 					'Include Lists In Search Results',
 				];

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

@@ -49,6 +49,13 @@ function getUpdates24_06_00(): array {
 		//kirstien - ByWater
 
 		//kodi - ByWater
+		'full_text_limiter' => [
+			'title' => 'Full Text Limiter',
+			'description' => 'Adds toggle for defaulting the full text limiter on/off for Ebsco EDS.',
+			'sql' => [
+				"ALTER TABLE ebsco_eds_settings ADD COLUMN fullTextLimiter TINYINT NOT NULL DEFAULT 1;",
+			],
+		], //full_text_limiter
 
 		//other
 

code/web/sys/Ebsco/EDSSettings.php

@@ -9,6 +9,7 @@ class EDSSettings extends DataObject {
 	public $edsApiUsername;
 	public $edsApiPassword;
 	public $edsSearchProfile;
+	public $fullTextLimiter;
 
 	public static function getObjectStructure($context = ''): array {
 		return [
@@ -54,6 +55,13 @@ public static function getObjectStructure($context = ''): array {
 				'description' => 'The password to use when connecting to the EBSCO API',
 				'hideInLists' => true,
 			],
+			'fullTextLimiter' => [
+				'property' => 'fullTextLimiter',
+				'type' => 'checkbox',
+				'label' => 'Full Text Limiter',
+				'description' => 'Enables/disables the full text limiter being automatically checked.',
+				'default' => true,
+			],
 		];
 	}
 }

code/web/sys/SearchObject/EbscoEdsSearcher.php

@@ -787,6 +787,10 @@ public function getRecords($ids) {
 	public function getLimitList() {
 		global $memCache;
 		$limitOptions = $memCache->get('ebsco_eds_limit_options_' . $this->getSettings()->edsApiProfile);
+		$fullText = true;
+		if (!$this->edsSettings->fullTextLimiter){
+			$fullText = false;
+		}
 		if ($limitOptions === false) {
 			$searchOptions = $this->getSearchOptions();
 			$limitOptions = [];
@@ -801,7 +805,7 @@ public function getLimitList() {
 							'defaultOn' => false,
 						];
 						if ($limit == 'FT') {
-							$limitOptions[$limit]['defaultOn'] = true;
+							$limitOptions[$limit]['defaultOn'] = $fullText;
 						}
 					}
 				}
@@ -814,6 +818,9 @@ public function getLimitList() {
 			if (array_key_exists($limit, $this->limiters)) {
 				$limitIsApplied = ($this->limiters[$limit]) == 'y' ? 1 : 0;
 			} else {
+				if ($limit == 'FT') {
+					$limitOption['defaultOn'] = $fullText;
+				}
 				$limitIsApplied = $limitOption['defaultOn'];
 			}
 			$limitList[$limit] = [

code/web/sys/SearchObject/SolrSearcher.php

@@ -346,7 +346,15 @@ public function processSearch($returnIndexErrors = false, $recommendations = fal
 		if (!empty($facetConfig)) {
 			$facetSet['limit'] = $this->facetLimit;
 			foreach ($facetConfig as $facetField => $facetInfo) {
-				$facetSet['field'][$facetField] = $facetInfo;
+/*				$facetSet['field'][$facetField] = $facetInfo;*/
+				$facetName = $facetInfo->facetName;
+				$isMultiSelect = $facetInfo->multiSelect;
+				if ($isMultiSelect) {
+					$facetKey = empty($facetInfo->id) ? $facetName : $facetInfo->id;
+					$facetSet['field'][$facetField] = "{!ex=$facetKey}" . $facetField;
+				}else{
+					$facetSet['field'][$facetField] = $facetName;
+				}
 			}
 			if ($this->facetOffset != null) {
 				$facetSet['offset'] = $this->facetOffset;

install/aspen.sql

@@ -4360,7 +4360,7 @@ CREATE TABLE `roles` (
 
 LOCK TABLES `roles` WRITE;
 /*!40000 ALTER TABLE `roles` DISABLE KEYS */;
-INSERT INTO `roles` VALUES (1,'userAdmin','Allows administration of users.'),(2,'opacAdmin','Allows administration of the opac display (libraries, locations, etc).'),(3,'genealogyContributor','Allows Genealogy data to be entered  by the user.'),(6,'libraryAdmin','Allows user to update library configuration for their library system only for their home location.'),(7,'contentEditor','Allows entering of editorial reviews and creation of widgets.'),(8,'library_material_requests','Allows user to manage material requests for a specific library.'),(9,'locationReports','Allows the user to view reports for their location.'),(10,'libraryManager','Allows user to do basic configuration for their library.'),(11,'locationManager','Allows user to do basic configuration for their location.'),(13,'listPublisher','Optionally only include lists from people with this role in search results.'),(31,'translator','Allows the user to translate the system.'),(32,'superCataloger','Allows user to perform cataloging activities that require advanced knowledge.'),(34,'Custom Role','This is a custom role'),(35,'Test Role','Just testing'),(36,'Masquerader','Allows the user to masquerade as any other user.'),(37,'Library Masquerader','Allows the user to masquerade as patrons of their home library only.'),(38,'Location Masquerader','Allows the user to masquerade as patrons of their home location only.'),(39,'Web Admin','Allows the user to administer web content for all libraries'),(40,'Library Web Admin','Allows the user to administer web content for their library'),(42,'test','test role');
+INSERT INTO `roles` VALUES (1,'userAdmin','Allows administration of users.'),(2,'opacAdmin','Allows full administration of Aspen settings for all libraries/locations.'),(3,'Genealogy Contributor','Allows Genealogy data to be entered by the user.'),(6,'Library Admin','Allows user to update library configuration for their library system only for their home location.'),(7,'Content Editor','Allows entering of editorial reviews and creation of widgets.'),(8,'Aspen Materials Requests','Allows user to manage material requests for a specific library.'),(9,'Location Reports','Allows the user to view reports for their location.'),(10,'Library Manager','Allows user to do basic configuration for their library.'),(11,'Location Manager','Allows user to do basic configuration for their location.'),(13,'List Publisher','Optionally only include lists from people with this role in search results.'),(31,'Translator','Allows the user to translate the system.'),(32,'Super Cataloger','Allows user to perform cataloging activities that require advanced knowledge.'),(33,'Cataloging','Allows user to perform basic cataloging activities.'),(36,'Masquerader','Allows the user to masquerade as any other user.'),(37,'Library Masquerader','Allows the user to masquerade as patrons of their home library only.'),(38,'Location Masquerader','Allows the user to masquerade as patrons of their home location only.'),(39,'Web Admin','Allows the user to administer web content for all libraries'),(40,'Library Web Admin','Allows the user to administer web content for their library');
 /*!40000 ALTER TABLE `roles` ENABLE KEYS */;
 UNLOCK TABLES;
 /*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;