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 2012/08/26 10:33:19 UTC
svn commit: r1377387 - in /ofbiz/branches/release12.04: ./
framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
Author: jleroux
Date: Sun Aug 26 08:33:18 2012
New Revision: 1377387
URL: http://svn.apache.org/viewvc?rev=1377387&view=rev
Log:
"Applied fix from trunk for revision: 1377386"
------------------------------------------------------------------------
r1377386 | jleroux | 2012-08-26 10:32:46 +0200 (dim., 26 août 2012) | 1 line
Revert r1377382, this was not complete
------------------------------------------------------------------------
Modified:
ofbiz/branches/release12.04/ (props changed)
ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1377386
Modified: ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java?rev=1377387&r1=1377386&r2=1377387&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java (original)
+++ ofbiz/branches/release12.04/framework/widget/src/org/ofbiz/widget/form/ModelFormField.java Sun Aug 26 08:33:18 2012
@@ -953,17 +953,9 @@ public class ModelFormField {
}
public String getTooltip(Map<String, Object> context) {
- if (UtilValidate.isNotEmpty(tooltip) && this.getEncodeOutput()) {
- String tooltipString = tooltip.expandString(context);
- StringUtil.SimpleEncoder simpleEncoder = (StringUtil.SimpleEncoder) context.get("simpleEncoder");
- if (simpleEncoder != null) {
- tooltipString = simpleEncoder.encode(tooltipString);
- }
- return tooltipString;
- } else {
+ if (UtilValidate.isNotEmpty(tooltip)) return tooltip.expandString(context);
return "";
}
- }
public String getUseWhen(Map<String, Object> context) {