LPS-134657 Reset param values when searching for the first time

adolfopa · Jul 13, 2021 · 23415b6 · 23415b6
1 parent 22d49de
commit 23415b6
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 5 deletions.
diff --git a/...c/main/java/com/liferay/blogs/web/internal/display/context/BlogEntriesDisplayContext.java b/...c/main/java/com/liferay/blogs/web/internal/display/context/BlogEntriesDisplayContext.java
@@ -155,7 +155,7 @@ public SearchContainer<BlogsEntry> getSearchContainer()
 				"no-entries-were-found");
 
 		String orderByCol = ParamUtil.getString(
-			_httpServletRequest, "orderByCol", "title");
+			_httpServletRequest, "orderByCol", _getDefaultOrderByCol());
 
 		entriesSearchContainer.setOrderByCol(orderByCol);
 
@@ -177,6 +177,17 @@ public SearchContainer<BlogsEntry> getSearchContainer()
 		return entriesSearchContainer;
 	}
 
+	private String _getDefaultOrderByCol() {
+		String mvcRenderCommandName = ParamUtil.getString(
+			_httpServletRequest, "mvcRenderCommandName");
+
+		if (mvcRenderCommandName.equals("/blogs/search")) {
+			return "relevance";
+		}
+
+		return "title";
+	}
+
 	private void _populateResults(SearchContainer<BlogsEntry> searchContainer)
 		throws PortalException {
 

diff --git a/...iferay/blogs/web/internal/display/context/BlogEntriesManagementToolbarDisplayContext.java b/...iferay/blogs/web/internal/display/context/BlogEntriesManagementToolbarDisplayContext.java
@@ -185,13 +185,33 @@ public String getSearchActionURL() {
 		return PortletURLBuilder.createRenderURL(
 			liferayPortletResponse
 		).setMVCRenderCommandName(
-			"/blogs/view"
+			"/blogs/search"
 		).setNavigation(
 			navigation
 		).setParameter(
-			"orderByCol", getOrderByCol()
+			"orderByCol",
+			() -> {
+				String mvcRenderCommandName = ParamUtil.getString(
+					httpServletRequest, "mvcRenderCommandName");
+
+				if (mvcRenderCommandName.equals("/blogs/search")) {
+					return getOrderByCol();
+				}
+
+				return null;
+			}
 		).setParameter(
-			"orderByType", getOrderByType()
+			"orderByType",
+			() -> {
+				String mvcRenderCommandName = ParamUtil.getString(
+					httpServletRequest, "mvcRenderCommandName");
+
+				if (mvcRenderCommandName.equals("/blogs/search")) {
+					return getOrderByType();
+				}
+
+				return null;
+			}
 		).buildString();
 	}
 

diff --git a/...web/src/main/java/com/liferay/blogs/web/internal/portlet/action/ViewMVCRenderCommand.java b/...web/src/main/java/com/liferay/blogs/web/internal/portlet/action/ViewMVCRenderCommand.java
@@ -40,7 +40,8 @@
 	property = {
 		"javax.portlet.name=" + BlogsPortletKeys.BLOGS,
 		"javax.portlet.name=" + BlogsPortletKeys.BLOGS_ADMIN,
-		"mvc.command.name=/", "mvc.command.name=/blogs/view"
+		"mvc.command.name=/", "mvc.command.name=/blogs/search",
+		"mvc.command.name=/blogs/view"
 	},
 	service = MVCRenderCommand.class
 )