From 56891aaa60902ff0cadd00cf515216c0dc9c144e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCrgen=20Kappler?= Date: Mon, 27 Nov 2023 12:49:37 +0100 Subject: [PATCH] LPS-202228 Take into account the highlighted DDM Structure when searching --- .../display/context/JournalDisplayContext.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/modules/apps/journal/journal-web/src/main/java/com/liferay/journal/web/internal/display/context/JournalDisplayContext.java b/modules/apps/journal/journal-web/src/main/java/com/liferay/journal/web/internal/display/context/JournalDisplayContext.java index db2cbcae290872..daffd1be7c0ee5 100644 --- a/modules/apps/journal/journal-web/src/main/java/com/liferay/journal/web/internal/display/context/JournalDisplayContext.java +++ b/modules/apps/journal/journal-web/src/main/java/com/liferay/journal/web/internal/display/context/JournalDisplayContext.java @@ -64,6 +64,7 @@ import com.liferay.portal.kernel.bean.BeanParamUtil; import com.liferay.portal.kernel.dao.search.SearchContainer; import com.liferay.portal.kernel.exception.PortalException; +import com.liferay.portal.kernel.feature.flag.FeatureFlagManagerUtil; import com.liferay.portal.kernel.json.JSONArray; import com.liferay.portal.kernel.json.JSONFactoryUtil; import com.liferay.portal.kernel.json.JSONObject; @@ -1912,7 +1913,16 @@ private void _populateSearchContext( long ddmStructureId = ParamUtil.getLong( _httpServletRequest, "ddmStructureId"); - if (ddmStructureId > 0) { + long highlightedDDMStructureId = ParamUtil.getLong( + _httpServletRequest, "highlightedDDMStructureId"); + + if (FeatureFlagManagerUtil.isEnabled("LPS-194763") && + (highlightedDDMStructureId > 0)) { + + searchContext.setClassTypeIds( + new long[] {highlightedDDMStructureId}); + } + else if (ddmStructureId > 0) { searchContext.setClassTypeIds(new long[] {ddmStructureId}); }