Merge branch '24.04.00' into 24.05.00

PTFS-Europe · Apr 16, 2024 · c348b51 · c348b51
2 parents 1e716a2 + ba7cc41
commit c348b51
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/code/reindexer/reindexer.jar b/code/reindexer/reindexer.jar
diff --git a/code/reindexer/src/com/turning_leaf_technologies/reindexer/SideLoadedEContentProcessor.java b/code/reindexer/src/com/turning_leaf_technologies/reindexer/SideLoadedEContentProcessor.java
@@ -84,7 +84,7 @@ private void loadScopeInfoForEContentItem(AbstractGroupedWorkSolr groupedWork, I
 		for (Scope curScope : indexer.getScopes()){
 			SideLoadScope sideLoadScope = curScope.getSideLoadScope(sideLoadId);
 			if (sideLoadScope != null) {
-				boolean itemPartOfScope = sideLoadScope.isItemPartOfScope(record, isAdult, isTeen, isAdult);
+				boolean itemPartOfScope = sideLoadScope.isItemPartOfScope(record, isAdult, isTeen, isKids);
 				if (itemPartOfScope) {
 					ScopingInfo scopingInfo = itemInfo.addScope(curScope);
 					groupedWork.addScopingInfo(curScope.getScopeName(), scopingInfo);

diff --git a/code/web/Drivers/CarlX.php b/code/web/Drivers/CarlX.php
@@ -966,7 +966,7 @@ public function getSelfRegistrationFields() {
 			'autocomplete' => false,
 		];
 		$fields[] = [
-			'default' => 'TN',
+			'default' => '',
 			'property' => 'state',
 			'type' => 'text',
 			'label' => 'State',