You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ad...@apache.org on 2008/05/06 22:02:21 UTC
svn commit: r653896 - in
/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html:
HtmlMenuRenderer.java HtmlScreenRenderer.java HtmlTreeRenderer.java
Author: adrianc
Date: Tue May 6 13:02:21 2008
New Revision: 653896
URL: http://svn.apache.org/viewvc?rev=653896&view=rev
Log:
Fixed bug in screen widgets where inter-app links didn't work.
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlTreeRenderer.java
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java?rev=653896&r1=653895&r2=653896&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java Tue May 6 13:02:21 2008
@@ -433,6 +433,16 @@
ContentUrlTag.appendContentPrefix(req, newURL);
newURL.append(target);
buffer.append(newURL.toString());
+ } else if ("inter-app".equalsIgnoreCase(urlMode) && req != null) {
+ String externalLoginKey = (String) req.getAttribute("externalLoginKey");
+ if (UtilValidate.isNotEmpty(externalLoginKey)) {
+ if (target.contains("?")) {
+ target += "&externalLoginKey=" + externalLoginKey;
+ } else {
+ target += "?externalLoginKey=" + externalLoginKey;
+ }
+ buffer.append(target);
+ }
} else {
buffer.append(target);
}
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java?rev=653896&r1=653895&r2=653896&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlScreenRenderer.java Tue May 6 13:02:21 2008
@@ -464,6 +464,16 @@
newURL.append(target);
writer.write(newURL.toString());
}
+ } else if ("inter-app".equalsIgnoreCase(urlMode) && request != null) {
+ String externalLoginKey = (String) request.getAttribute("externalLoginKey");
+ if (UtilValidate.isNotEmpty(externalLoginKey)) {
+ if (target.contains("?")) {
+ target += "&externalLoginKey=" + externalLoginKey;
+ } else {
+ target += "?externalLoginKey=" + externalLoginKey;
+ }
+ writer.write(target);
+ }
} else {
writer.write(target);
}
Modified: ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlTreeRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlTreeRenderer.java?rev=653896&r1=653895&r2=653896&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlTreeRenderer.java (original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/html/HtmlTreeRenderer.java Tue May 6 13:02:21 2008
@@ -269,6 +269,16 @@
ContentUrlTag.appendContentPrefix(req, newURL);
newURL.append(target);
writer.write(newURL.toString());
+ } else if ("inter-app".equalsIgnoreCase(urlMode) && req != null) {
+ String externalLoginKey = (String) req.getAttribute("externalLoginKey");
+ if (UtilValidate.isNotEmpty(externalLoginKey)) {
+ if (target.contains("?")) {
+ target += "&externalLoginKey=" + externalLoginKey;
+ } else {
+ target += "?externalLoginKey=" + externalLoginKey;
+ }
+ writer.write(target);
+ }
} else {
writer.write(target);
}