LPS-127443 Use different search container IDs

adolfopa · Mar 3, 2021 · b529e6a · b529e6a
1 parent c7640fb
commit b529e6a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/...s/web/internal/display/context/AnnouncementsAdminViewManagementToolbarDisplayContext.java b/...s/web/internal/display/context/AnnouncementsAdminViewManagementToolbarDisplayContext.java
@@ -39,6 +39,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import javax.portlet.PortletURL;
 
@@ -177,6 +178,14 @@ public List<LabelItem> getFilterLabelItems() {
 		).build();
 	}
 
+	public String getSearchContainerId() {
+		if (Objects.equals(_getNavigation(), "alerts")) {
+			return "alertsEntries";
+		}
+
+		return "announcementsEntries";
+	}
+
 	public int getTotal() {
 		return _searchContainer.getTotal();
 	}

diff --git a/...ents/announcements-web/src/main/resources/META-INF/resources/announcements_admin/view.jsp b/...ents/announcements-web/src/main/resources/META-INF/resources/announcements_admin/view.jsp
@@ -86,7 +86,7 @@ AnnouncementsAdminViewManagementToolbarDisplayContext announcementsAdminViewMana
 	filterLabelItems="<%= announcementsAdminViewManagementToolbarDisplayContext.getFilterLabelItems() %>"
 	itemsTotal="<%= announcementsAdminViewManagementToolbarDisplayContext.getTotal() %>"
 	propsTransformer="announcements_admin/js/AnnouncementsManagementToolbarPropsTransformer"
-	searchContainerId="announcementsEntries"
+	searchContainerId="<%= announcementsAdminViewManagementToolbarDisplayContext.getSearchContainerId() %>"
 	selectable="<%= true %>"
 	showSearch="<%= false %>"
 />
@@ -97,7 +97,7 @@ AnnouncementsAdminViewManagementToolbarDisplayContext announcementsAdminViewMana
 		<aui:input name="redirect" type="hidden" value="<%= currentURL %>" />
 
 		<liferay-ui:search-container
-			id="announcementsEntries"
+			id="<%= announcementsAdminViewManagementToolbarDisplayContext.getSearchContainerId() %>"
 			searchContainer="<%= announcementsEntriesSearchContainer %>"
 			total="<%= announcementsEntriesSearchContainer.getTotal() %>"
 		>