LPD-19184 Add objectFolderName query parameter to the URL of the Obje…

…ctDefinitions page
liferay-commerce · Mar 18, 2024 · 2eff587 · 2eff587
1 parent 0bd7dd9
commit 2eff587
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/...-web/src/main/resources/META-INF/resources/object_definitions/view_object_definitions.jsp b/...-web/src/main/resources/META-INF/resources/object_definitions/view_object_definitions.jsp
@@ -18,7 +18,12 @@ ViewObjectDefinitionsDisplayContext viewObjectDefinitionsDisplayContext = (ViewO
 		module="{ViewObjectDefinitions} from object-web"
 		props='<%=
 			HashMapBuilder.<String, Object>put(
-				"baseResourceURL", String.valueOf(baseResourceURL)
+				"baseResourceURL",
+				URLBuilder.create(
+					String.valueOf(baseResourceURL)
+				).setParameter(
+					"objectFolderName", "Default"
+				).build()
 			).put(
 				"editObjectDefinitionURL", viewObjectDefinitionsDisplayContext.getEditObjectDefinitionURL()
 			).put(

diff --git a/...ct/object-web/src/main/resources/META-INF/resources/object_folders/view_model_builder.jsp b/...ct/object-web/src/main/resources/META-INF/resources/object_folders/view_model_builder.jsp
@@ -8,7 +8,13 @@
 <%@ include file="/init.jsp" %>
 
 <%
-String backURL = ParamUtil.getString(request, "backURL", String.valueOf(renderResponse.createRenderURL()));
+String backURL = ParamUtil.getString(
+	request, "backURL",
+	URLBuilder.create(
+		String.valueOf(renderResponse.createRenderURL())
+	).setParameter(
+		"objectFolderName", "Default"
+	).build());
 ObjectDefinitionsDetailsDisplayContext objectDefinitionsDetailsDisplayContext = (ObjectDefinitionsDetailsDisplayContext)request.getAttribute(ObjectWebKeys.OBJECT_DEFINITIONS_DETAILS_DISPLAY_CONTEXT);
 ObjectDefinitionsFieldsDisplayContext objectDefinitionsFieldsDisplayContext = (ObjectDefinitionsFieldsDisplayContext)request.getAttribute(ObjectWebKeys.OBJECT_DEFINITIONS_FIELD_DISPLAY_CONTEXT);
 ObjectDefinitionsRelationshipsDisplayContext objectDefinitionsRelationshipsDisplayContext = (ObjectDefinitionsRelationshipsDisplayContext)request.getAttribute(ObjectWebKeys.OBJECT_DEFINITIONS_RELATIONSHIP_DISPLAY_CONTEXT);