Merge branch 'liferay:master' into master

liferay-frontend · Aug 14, 2023 · 7554d6a · 7554d6a
2 parents c7e0cf6 + 9c4968c
commit 7554d6a
Show file tree

Hide file tree

Showing 61 changed files with 656 additions and 566 deletions.
diff --git a/modules/.releng/sdk/gradle-plugins-target-platform/artifact.properties b/modules/.releng/sdk/gradle-plugins-target-platform/artifact.properties
@@ -1,4 +1,4 @@
-artifact.git.id=f95321eaee5952633af55422eb84d8d39ca081f0
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.target.platform/3.0.13/com.liferay.gradle.plugins.target.platform-3.0.13-javadoc.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.target.platform/3.0.13/com.liferay.gradle.plugins.target.platform-3.0.13-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.target.platform/3.0.13/com.liferay.gradle.plugins.target.platform-3.0.13.jar
+artifact.git.id=b0a72f864fc95d19ba588e04047fe8f5f750b0e2
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.target.platform/3.0.14/com.liferay.gradle.plugins.target.platform-3.0.14-javadoc.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.target.platform/3.0.14/com.liferay.gradle.plugins.target.platform-3.0.14-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.target.platform/3.0.14/com.liferay.gradle.plugins.target.platform-3.0.14.jar
diff --git a/modules/.releng/sdk/gradle-plugins-workspace/artifact.properties b/modules/.releng/sdk/gradle-plugins-workspace/artifact.properties
@@ -1,4 +1,4 @@
-artifact.git.id=f95321eaee5952633af55422eb84d8d39ca081f0
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/7.0.2/com.liferay.gradle.plugins.workspace-7.0.2-javadoc.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/7.0.2/com.liferay.gradle.plugins.workspace-7.0.2-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/7.0.2/com.liferay.gradle.plugins.workspace-7.0.2.jar
+artifact.git.id=ca79d686f4079e6c7b2f1cb9b9ec2b8f1b4da67a
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/8.0.0/com.liferay.gradle.plugins.workspace-8.0.0-javadoc.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/8.0.0/com.liferay.gradle.plugins.workspace-8.0.0-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.gradle.plugins.workspace/8.0.0/com.liferay.gradle.plugins.workspace-8.0.0.jar
diff --git a/modules/.releng/sdk/project-templates/project-templates-workspace/artifact.properties b/modules/.releng/sdk/project-templates/project-templates-workspace/artifact.properties
@@ -1,4 +1,3 @@
-artifact.git.id=9d383267165fb881965ffe7df64d62029ea7e2dc
-artifact.sources-commercial.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates.workspace/1.0.198/com.liferay.project.templates.workspace-1.0.198-sources-commercial.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates.workspace/1.0.198/com.liferay.project.templates.workspace-1.0.198-sources.jar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates.workspace/1.0.198/com.liferay.project.templates.workspace-1.0.198.jar
+artifact.git.id=fe87c4efade03443e1164c4596c45974de14e154
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates.workspace/1.0.199/com.liferay.project.templates.workspace-1.0.199-sources.jar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates.workspace/1.0.199/com.liferay.project.templates.workspace-1.0.199.jar
diff --git a/modules/.releng/sdk/project-templates/project-templates/artifact.properties b/modules/.releng/sdk/project-templates/project-templates/artifact.properties
@@ -1,7 +1,6 @@
-artifact.git.id=9d383267165fb881965ffe7df64d62029ea7e2dc
-artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.251/com.liferay.project.templates-5.0.251-javadoc.jar
-artifact.sources-commercial.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.251/com.liferay.project.templates-5.0.251-sources-commercial.jar
-artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.251/com.liferay.project.templates-5.0.251-sources.jar
-artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.251/com.liferay.project.templates-5.0.251.tar
-artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.251/com.liferay.project.templates-5.0.251.jar
-artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.251/com.liferay.project.templates-5.0.251.zip
+artifact.git.id=fe87c4efade03443e1164c4596c45974de14e154
+artifact.javadoc.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.252/com.liferay.project.templates-5.0.252-javadoc.jar
+artifact.sources.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.252/com.liferay.project.templates-5.0.252-sources.jar
+artifact.tar.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.252/com.liferay.project.templates-5.0.252.tar
+artifact.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.252/com.liferay.project.templates-5.0.252.jar
+artifact.zip.url=https://repository-cdn.liferay.com/nexus/content/repositories/liferay-public-releases/com/liferay/com.liferay.project.templates/5.0.252/com.liferay.project.templates-5.0.252.zip
diff --git a/...t/item/selector/web/internal/layout/list/retriever/AssetEntryListLayoutListRetriever.java b/...t/item/selector/web/internal/layout/list/retriever/AssetEntryListLayoutListRetriever.java
@@ -15,6 +15,7 @@
 import com.liferay.info.filter.InfoFilter;
 import com.liferay.info.filter.KeywordsInfoFilter;
 import com.liferay.info.filter.TagsInfoFilter;
+import com.liferay.info.pagination.InfoPage;
 import com.liferay.info.pagination.Pagination;
 import com.liferay.item.selector.criteria.InfoListItemSelectorReturnType;
 import com.liferay.layout.list.retriever.ClassedModelListObjectReference;
@@ -53,7 +54,7 @@ public long getDefaultVariationSegmentsEntryId(
 	}
 
 	@Override
-	public List<Object> getList(
+	public InfoPage<?> getInfoPage(
 		ClassedModelListObjectReference classedModelListObjectReference,
 		LayoutListRetrieverContext layoutListRetrieverContext) {
 
@@ -62,7 +63,9 @@ public List<Object> getList(
 				classedModelListObjectReference.getClassPK());
 
 		if (assetListEntry == null) {
-			return Collections.emptyList();
+			return InfoPage.of(
+				Collections.emptyList(),
+				layoutListRetrieverContext.getPagination(), 0);
 		}
 
 		long[] segmentsEntryIds =
@@ -86,41 +89,53 @@ public List<Object> getList(
 				_getKeywords(layoutListRetrieverContext), StringPool.BLANK,
 				pagination.getStart(), pagination.getEnd());
 
+		long[] finalSegmentsEntryIds = segmentsEntryIds;
+
 		if (Objects.equals(
 				AssetEntry.class.getName(),
 				assetListEntry.getAssetEntryType())) {
 
-			return Collections.unmodifiableList(assetEntries);
+			return InfoPage.of(
+				Collections.unmodifiableList(assetEntries),
+				layoutListRetrieverContext.getPagination(),
+				() -> _assetListAssetEntryProvider.getAssetEntriesCount(
+					assetListEntry, finalSegmentsEntryIds,
+					_getAssetCategoryIds(layoutListRetrieverContext),
+					_getAssetTagNames(layoutListRetrieverContext),
+					_getKeywords(layoutListRetrieverContext),
+					StringPool.BLANK));
 		}
 
-		return _toAssetObjects(assetEntries);
+		return InfoPage.of(
+			_toAssetObjects(assetEntries),
+			layoutListRetrieverContext.getPagination(),
+			() -> _assetListAssetEntryProvider.getAssetEntriesCount(
+				assetListEntry, finalSegmentsEntryIds,
+				_getAssetCategoryIds(layoutListRetrieverContext),
+				_getAssetTagNames(layoutListRetrieverContext),
+				_getKeywords(layoutListRetrieverContext), StringPool.BLANK));
 	}
 
 	@Override
-	public int getListCount(
+	public List<Object> getList(
 		ClassedModelListObjectReference classedModelListObjectReference,
 		LayoutListRetrieverContext layoutListRetrieverContext) {
 
-		AssetListEntry assetListEntry =
-			_assetListEntryLocalService.fetchAssetListEntry(
-				classedModelListObjectReference.getClassPK());
+		InfoPage<?> infoPage = getInfoPage(
+			classedModelListObjectReference, layoutListRetrieverContext);
 
-		if (assetListEntry == null) {
-			return 0;
-		}
+		return (List<Object>)infoPage.getPageItems();
+	}
 
-		long[] segmentsEntryIds =
-			layoutListRetrieverContext.getSegmentsEntryIds();
+	@Override
+	public int getListCount(
+		ClassedModelListObjectReference classedModelListObjectReference,
+		LayoutListRetrieverContext layoutListRetrieverContext) {
 
-		if (segmentsEntryIds == null) {
-			segmentsEntryIds = new long[] {0};
-		}
+		InfoPage<?> infoPage = getInfoPage(
+			classedModelListObjectReference, layoutListRetrieverContext);
 
-		return _assetListAssetEntryProvider.getAssetEntriesCount(
-			assetListEntry, segmentsEntryIds,
-			_getAssetCategoryIds(layoutListRetrieverContext),
-			_getAssetTagNames(layoutListRetrieverContext),
-			_getKeywords(layoutListRetrieverContext), StringPool.BLANK);
+		return infoPage.getTotalCount();
 	}
 
 	@Override

diff --git a/...mmerce-checkout-web/src/main/resources/META-INF/resources/checkout_step/delivery_term.jsp b/...mmerce-checkout-web/src/main/resources/META-INF/resources/checkout_step/delivery_term.jsp
@@ -22,9 +22,9 @@ long deliveryCommerceTermEntryId = BeanParamUtil.getLong(termCommerceCheckoutSte
 				<clay:col
 					size="12"
 				>
-					<aui:alert type="info">
-						<liferay-ui:message key="there-are-no-available-delivery-terms" />
-					</aui:alert>
+					<clay:alert
+						message="there-are-no-available-delivery-terms"
+					/>
 				</clay:col>
 			</clay:row>
 

diff --git a/...merce-checkout-web/src/main/resources/META-INF/resources/checkout_step/payment_method.jsp b/...merce-checkout-web/src/main/resources/META-INF/resources/checkout_step/payment_method.jsp
@@ -26,9 +26,9 @@ String commercePaymentMethodKey = BeanParamUtil.getString(commerceOrder, request
 				<clay:col
 					size="12"
 				>
-					<aui:alert type="info">
-						<liferay-ui:message key="there-are-no-available-payment-methods" />
-					</aui:alert>
+					<clay:alert
+						message="there-are-no-available-payment-methods"
+					/>
 				</clay:col>
 			</clay:row>
 

diff --git a/...ommerce-checkout-web/src/main/resources/META-INF/resources/checkout_step/payment_term.jsp b/...ommerce-checkout-web/src/main/resources/META-INF/resources/checkout_step/payment_term.jsp
@@ -22,9 +22,9 @@ long paymentCommerceTermEntryId = BeanParamUtil.getLong(termCommerceCheckoutStep
 				<clay:col
 					size="12"
 				>
-					<aui:alert type="info">
-						<liferay-ui:message key="there-are-no-available-payment-terms" />
-					</aui:alert>
+					<clay:alert
+						message="there-are-no-available-payment-terms"
+					/>
 				</clay:col>
 			</clay:row>
 

diff --git a/...erce-checkout-web/src/main/resources/META-INF/resources/checkout_step/shipping_method.jsp b/...erce-checkout-web/src/main/resources/META-INF/resources/checkout_step/shipping_method.jsp
@@ -29,9 +29,9 @@ if (Validator.isNull(commerceShippingOptionKey)) {
 				<clay:col
 					size="12"
 				>
-					<aui:alert type="info">
-						<liferay-ui:message key="there-are-no-available-shipping-methods" />
-					</aui:alert>
+					<clay:alert
+						message="there-are-no-available-shipping-methods"
+					/>
 				</clay:col>
 			</clay:row>
 

diff --git a/...ommerce-order-web/src/main/resources/META-INF/resources/commerce_order/delivery_terms.jsp b/...ommerce-order-web/src/main/resources/META-INF/resources/commerce_order/delivery_terms.jsp
@@ -28,9 +28,9 @@ long deliveryCommerceTermEntryId = commerceOrder.getDeliveryCommerceTermEntryId(
 				<clay:col
 					size="12"
 				>
-					<aui:alert type="info">
-						<liferay-ui:message key="there-are-no-available-delivery-terms" />
-					</aui:alert>
+					<clay:alert
+						message="there-are-no-available-delivery-terms"
+					/>
 				</clay:col>
 			</clay:row>
 

diff --git a/...commerce-order-web/src/main/resources/META-INF/resources/commerce_order/payment_terms.jsp b/...commerce-order-web/src/main/resources/META-INF/resources/commerce_order/payment_terms.jsp
@@ -28,9 +28,9 @@ long paymentCommerceTermEntryId = commerceOrder.getPaymentCommerceTermEntryId();
 				<clay:col
 					size="12"
 				>
-					<aui:alert type="info">
-						<liferay-ui:message key="there-are-no-available-payment-terms" />
-					</aui:alert>
+					<clay:alert
+						message="there-are-no-available-payment-terms"
+					/>
 				</clay:col>
 			</clay:row>
 

diff --git a/...eb/src/main/resources/META-INF/resources/definition/edit_definition_subscription_info.jsp b/...eb/src/main/resources/META-INF/resources/definition/edit_definition_subscription_info.jsp
@@ -61,9 +61,11 @@ if (deliveryMaxSubscriptionCycles > 0) {
 }
 %>
 
-<aui:alert closeable="<%= false %>" cssClass="mt-3" type="warning">
-	<liferay-ui:message key="all-channels-associated-with-this-product-must-have-at-least-one-payment-method-active-that-supports-recurring-payments" />
-</aui:alert>
+<clay:alert
+	cssClass="mt-3"
+	displayType="warning"
+	message="all-channels-associated-with-this-product-must-have-at-least-one-payment-method-active-that-supports-recurring-payments"
+/>
 
 <portlet:actionURL name="/cp_definitions/edit_cp_definition" var="editProductDefinitionSubscriptionInfoActionURL" />
 

diff --git a/...-web/src/main/resources/META-INF/resources/definition/edit_instance_subscription_info.jsp b/...-web/src/main/resources/META-INF/resources/definition/edit_instance_subscription_info.jsp
@@ -73,9 +73,10 @@ if (deliveryMaxSubscriptionCycles > 0) {
 }
 %>
 
-<aui:alert closeable="<%= false %>" type="warning">
-	<liferay-ui:message key="all-channels-associated-with-this-product-must-have-at-least-one-payment-method-active-that-supports-recurring-payments" />
-</aui:alert>
+<clay:alert
+	displayType="warning"
+	message="all-channels-associated-with-this-product-must-have-at-least-one-payment-method-active-that-supports-recurring-payments"
+/>
 
 <portlet:actionURL name="/cp_definitions/edit_cp_instance" var="editProductInstanceShippingInfoActionURL" />
 

diff --git a/...dmin/configuration-admin-web/src/main/resources/META-INF/resources/edit_configuration.jsp b/...dmin/configuration-admin-web/src/main/resources/META-INF/resources/edit_configuration.jsp
@@ -198,9 +198,9 @@ renderResponse.setTitle(categoryDisplayName);
 					</h2>
 
 					<c:if test="<%= configurationModel.hasScopeConfiguration(configurationScopeDisplayContext.getScope()) && configurationModel.isReadOnly() %>">
-						<aui:alert closeable="<%= false %>" id="readonlyAlert" type="info">
-							<liferay-ui:message key="this-configuration-is-read-only" />
-						</aui:alert>
+						<clay:alert
+							message="this-configuration-is-read-only"
+						/>
 					</c:if>
 
 					<c:if test="<%= !configurationModel.hasScopeConfiguration(configurationScopeDisplayContext.getScope()) %>">

diff --git a/modules/apps/document-library/document-library-preview-audio/build.gradle b/modules/apps/document-library/document-library-preview-audio/build.gradle
@@ -10,6 +10,7 @@ dependencies {
 	compileOnly project(":apps:document-library:document-library-api")
 	compileOnly project(":apps:document-library:document-library-preview-api")
 	compileOnly project(":apps:frontend-taglib:frontend-taglib")
+	compileOnly project(":apps:frontend-taglib:frontend-taglib-clay")
 	compileOnly project(":apps:static:portal-configuration:portal-configuration-metatype-api")
 	compileOnly project(":core:petra:petra-io")
 	compileOnly project(":core:petra:petra-sql-dsl-api")

diff --git a/...-INF/resources/dynamic_include/com.liferay.configuration.admin.web/edit_configuration.jsp b/...-INF/resources/dynamic_include/com.liferay.configuration.admin.web/edit_configuration.jsp
@@ -12,7 +12,8 @@ DLAudioFFMPEGAudioConverter dlAudioFFMPEGAudioConverter = (DLAudioFFMPEGAudioCon
 %>
 
 <c:if test="<%= dlAudioFFMPEGAudioConverter.isEnabled() && !DLAudioFFMPEGUtil.isFFMPEGInstalled() %>">
-	<aui:alert closeable="<%= false %>" type="danger">
-		<liferay-ui:message arguments="https://ffmpeg.org/download.html" key="the-ffmpeg-executable-is-not-installed-on-your-system.-please-contact-your-administrator-to-install-it-following-the-instructions-in-x" />
-	</aui:alert>
+	<clay:alert
+		displayType="danger"
+		message='<%= LanguageUtil.format(request, "the-ffmpeg-executable-is-not-installed-on-your-system.-please-contact-your-administrator-to-install-it-following-the-instructions-in-x", "https://ffmpeg.org/download.html") %>'
+	/>
 </c:if>
diff --git a/...ment-library-preview-audio/src/main/resources/META-INF/resources/dynamic_include/init.jsp b/...ment-library-preview-audio/src/main/resources/META-INF/resources/dynamic_include/init.jsp
@@ -7,8 +7,8 @@
 
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 
-<%@ taglib uri="http://liferay.com/tld/aui" prefix="aui" %><%@
-taglib uri="http://liferay.com/tld/ui" prefix="liferay-ui" %>
+<%@ taglib uri="http://liferay.com/tld/clay" prefix="clay" %>
 
 <%@ page import="com.liferay.document.library.preview.audio.internal.DLAudioFFMPEGAudioConverter" %><%@
-page import="com.liferay.document.library.preview.audio.internal.util.DLAudioFFMPEGUtil" %>
+page import="com.liferay.document.library.preview.audio.internal.util.DLAudioFFMPEGUtil" %><%@
+page import="com.liferay.portal.kernel.language.LanguageUtil" %>
diff --git a/...-INF/resources/dynamic_include/com.liferay.configuration.admin.web/edit_configuration.jsp b/...-INF/resources/dynamic_include/com.liferay.configuration.admin.web/edit_configuration.jsp
@@ -12,7 +12,8 @@ DLVideoFFMPEGVideoConverter dlVideoFFMPEGVideoConverter = (DLVideoFFMPEGVideoCon
 %>
 
 <c:if test="<%= dlVideoFFMPEGVideoConverter.isEnabled() && !DLVideoFFMPEGUtil.isFFMPEGInstalled() %>">
-	<aui:alert closeable="<%= false %>" type="danger">
-		<liferay-ui:message arguments="https://ffmpeg.org/download.html" key="the-ffmpeg-executable-is-not-installed-on-your-system.-please-contact-your-administrator-to-install-it-following-the-instructions-in-x" />
-	</aui:alert>
+	<clay:alert
+		displayType="danger"
+		message='<%= LanguageUtil.format(request, "the-ffmpeg-executable-is-not-installed-on-your-system.-please-contact-your-administrator-to-install-it-following-the-instructions-in-x", "https://ffmpeg.org/download.html") %>'
+	/>
 </c:if>
diff --git a/...ps/document-library/document-library-video/src/main/resources/META-INF/resources/init.jsp b/...ps/document-library/document-library-video/src/main/resources/META-INF/resources/init.jsp
@@ -25,6 +25,7 @@ page import="com.liferay.document.library.video.internal.converter.DLVideoFFMPEG
 page import="com.liferay.document.library.video.internal.util.DLVideoFFMPEGUtil" %><%@
 page import="com.liferay.document.library.video.renderer.DLVideoRenderer" %><%@
 page import="com.liferay.item.selector.criteria.VideoEmbeddableHTMLItemSelectorReturnType" %><%@
+page import="com.liferay.portal.kernel.language.LanguageUtil" %><%@
 page import="com.liferay.portal.kernel.repository.model.FileVersion" %><%@
 page import="com.liferay.portal.kernel.util.ContentTypes" %><%@
 page import="com.liferay.portal.kernel.util.HashMapBuilder" %><%@

diff --git a/...om/liferay/fragment/internal/util/configuration/FragmentEntryConfigurationParserImpl.java b/...om/liferay/fragment/internal/util/configuration/FragmentEntryConfigurationParserImpl.java
@@ -16,6 +16,7 @@
 import com.liferay.info.item.ClassPKInfoItemIdentifier;
 import com.liferay.info.item.InfoItemServiceRegistry;
 import com.liferay.info.item.provider.InfoItemObjectProvider;
+import com.liferay.info.pagination.InfoPage;
 import com.liferay.info.pagination.Pagination;
 import com.liferay.layout.list.retriever.DefaultLayoutListRetrieverContext;
 import com.liferay.layout.list.retriever.LayoutListRetriever;
@@ -725,9 +726,11 @@ private Object _getInfoListObjectEntry(
 			defaultLayoutListRetrieverContext.setSegmentsEntryIds(
 				segmentsEntryIds);
 
-			return layoutListRetriever.getList(
+			InfoPage<?> infoPage = layoutListRetriever.getInfoPage(
 				listObjectReferenceFactory.getListObjectReference(jsonObject),
 				defaultLayoutListRetrieverContext);
+
+			return infoPage.getPageItems();
 		}
 		catch (Exception exception) {
 			if (_log.isDebugEnabled()) {