diff --git a/modules/apps/journal/journal-web/src/main/java/com/liferay/journal/web/internal/display/context/JournalManagementToolbarDisplayContext.java b/modules/apps/journal/journal-web/src/main/java/com/liferay/journal/web/internal/display/context/JournalManagementToolbarDisplayContext.java index 5f62110bd62661..4f8d435e56dad6 100644 --- a/modules/apps/journal/journal-web/src/main/java/com/liferay/journal/web/internal/display/context/JournalManagementToolbarDisplayContext.java +++ b/modules/apps/journal/journal-web/src/main/java/com/liferay/journal/web/internal/display/context/JournalManagementToolbarDisplayContext.java @@ -383,14 +383,26 @@ public List getFilterLabelItems() { labelItemListWrapper.add( _journalDisplayContext::isNavigationMine, labelItem -> { - labelItem.putData( - "removeLabelURL", - PortletURLBuilder.create( - PortletURLUtil.clone( - currentURLObj, liferayPortletResponse) - ).setParameter( - "navigationMine", (String)null - ).buildString()); + if (FeatureFlagManagerUtil.isEnabled("LPS-196768")) { + labelItem.putData( + "removeLabelURL", + PortletURLBuilder.create( + PortletURLUtil.clone( + currentURLObj, liferayPortletResponse) + ).setParameter( + "navigationMine", (String)null + ).buildString()); + } + else { + labelItem.putData( + "removeLabelURL", + PortletURLBuilder.create( + PortletURLUtil.clone( + currentURLObj, liferayPortletResponse) + ).setNavigation( + (String)null + ).buildString()); + } labelItem.setCloseable(true); @@ -407,14 +419,26 @@ public List getFilterLabelItems() { ).add( _journalDisplayContext::isNavigationRecent, labelItem -> { - labelItem.putData( - "removeLabelURL", - PortletURLBuilder.create( - PortletURLUtil.clone( - currentURLObj, liferayPortletResponse) - ).setParameter( - "navigationRecent", (String)null - ).buildString()); + if (FeatureFlagManagerUtil.isEnabled("LPS-196768")) { + labelItem.putData( + "removeLabelURL", + PortletURLBuilder.create( + PortletURLUtil.clone( + currentURLObj, liferayPortletResponse) + ).setParameter( + "navigationRecent", (String)null + ).buildString()); + } + else { + labelItem.putData( + "removeLabelURL", + PortletURLBuilder.create( + PortletURLUtil.clone( + currentURLObj, liferayPortletResponse) + ).setNavigation( + (String)null + ).buildString()); + } labelItem.setCloseable(true); labelItem.setLabel(