LPS-125224 Navigate to Address table after adding or editing an address

pei-jung · Dec 22, 2020 · ecae56c · ecae56c
1 parent f1dbd86
commit ecae56c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 13 deletions.
diff --git a/...ay/account/admin/web/internal/portlet/action/EditAccountEntryAddressMVCActionCommand.java b/...ay/account/admin/web/internal/portlet/action/EditAccountEntryAddressMVCActionCommand.java
@@ -25,7 +25,6 @@
 import com.liferay.portal.kernel.service.ServiceContextFactory;
 import com.liferay.portal.kernel.theme.ThemeDisplay;
 import com.liferay.portal.kernel.util.Constants;
-import com.liferay.portal.kernel.util.Http;
 import com.liferay.portal.kernel.util.ParamUtil;
 import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portal.kernel.util.WebKeys;
@@ -89,20 +88,15 @@ protected void doProcessAction(
 
 		String cmd = ParamUtil.getString(actionRequest, Constants.CMD);
 
-		String redirect = ParamUtil.getString(actionRequest, "redirect");
-
 		if (cmd.equals(Constants.ADD)) {
-			Address address = addAccountEntryAddress(actionRequest);
-
-			redirect = _http.setParameter(
-				redirect,
-				actionResponse.getNamespace() + "accountEntryAddressId",
-				address.getAddressId());
+			addAccountEntryAddress(actionRequest);
 		}
 		else if (cmd.equals(Constants.UPDATE)) {
 			updateAccountEntryAddress(actionRequest);
 		}
 
+		String redirect = ParamUtil.getString(actionRequest, "redirect");
+
 		if (Validator.isNotNull(redirect)) {
 			sendRedirect(actionRequest, actionResponse, redirect);
 		}
@@ -137,7 +131,4 @@ protected void updateAccountEntryAddress(ActionRequest actionRequest)
 	@Reference
 	private AddressLocalService _addressLocalService;
 
-	@Reference
-	private Http _http;
-
 }
diff --git a/...rc/main/resources/META-INF/resources/account_entries_admin/edit_account_entry_address.jsp b/...rc/main/resources/META-INF/resources/account_entries_admin/edit_account_entry_address.jsp
@@ -37,7 +37,7 @@ renderResponse.setTitle((accountEntryAddressId == 0) ? LanguageUtil.get(request,
 	action="<%= editAccountEntryAddressURL %>"
 >
 	<aui:input name="<%= Constants.CMD %>" type="hidden" value="<%= (accountEntryAddressId == 0) ? Constants.ADD : Constants.UPDATE %>" />
-	<aui:input name="redirect" type="hidden" value="<%= currentURL %>" />
+	<aui:input name="redirect" type="hidden" value="<%= backURL %>" />
 	<aui:input name="accountEntryAddressId" type="hidden" value="<%= accountEntryAddressId %>" />
 	<aui:input name="accountEntryId" type="hidden" value="<%= accountEntryDisplay.getAccountEntryId() %>" />