You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2014/10/20 00:09:44 UTC
svn commit: r1633016 - in /ofbiz/branches/release12.04: ./
framework/widget/src/org/ofbiz/widget/WidgetWorker.java
Author: jleroux
Date: Sun Oct 19 22:09:43 2014
New Revision: 1633016
URL: http://svn.apache.org/r1633016
Log:
"Applied fix from trunk for revision: 1632803 "
------------------------------------------------------------------------
r1632803 | ashish | 2014-10-18 17:02:12 +0200 (sam. 18 oct. 2014) | 2 lignes
Applied patch from jira issue - OFBIZ-3382 - inter-app hyperlink generates incorrect url.
Thanks Pranay for the contribution and thanks Nathan for reporting the issue.
------------------------------------------------------------------------
Modified:
ofbiz/branches/release12.04/ (props changed)
ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/WidgetWorker.java
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1632803
Modified: ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/WidgetWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/WidgetWorker.java?rev=1633016&r1=1633015&r2=1633016&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/WidgetWorker.java (original)
+++ ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/WidgetWorker.java Sun Oct 19 22:09:43 2014
@@ -58,6 +58,10 @@ public class WidgetWorker {
public static void buildHyperlinkUrl(Appendable externalWriter, String target, String targetType, Map<String, String> parameterMap,
String prefix, boolean fullPath, boolean secure, boolean encode, HttpServletRequest request, HttpServletResponse response, Map<String, Object> context) throws IOException {
String localRequestName = UtilHttp.encodeAmpersands(target);
+ // We may get an encoded request like: /projectmgr/control/EditTaskContents?workEffortId=10003
+ // Try to reducing a possibly encoded string down to its simplest form: /projectmgr/control/EditTaskContents?workEffortId=10003
+ // This step make sure the following appending externalLoginKey operation to work correctly
+ localRequestName = StringUtil.defaultWebEncoder.canonicalize(localRequestName);
Appendable localWriter = new StringWriter();
if ("intra-app".equals(targetType)) {