Author: doogie
Date: Wed Feb 24 03:31:49 2010
New Revision: 915650
URL: http://svn.apache.org/viewvc?rev=915650&view=rev
Log:
Reverting 912645, for now, until I have time to investigate further.
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java?rev=915650&r1=915649&r2=915650&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java
(original)
+++ ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/ModelFormAction.java
Wed Feb 24 03:31:49 2010
@@ -136,12 +136,12 @@
newValue = this.fromField.get(context);
if (Debug.verboseOn()) Debug.logVerbose("In screen getting
value for field from [" + this.fromField.getOriginalName() + "]: " + newValue,
module);
} else if (!this.valueExdr.isEmpty()) {
- newValue = this.valueExdr.expand(context);
+ newValue = this.valueExdr.expandString(context);
}
// If newValue is still empty, use the default value
if (ObjectType.isEmpty(newValue) && !this.defaultExdr.isEmpty()) {
- newValue = this.defaultExdr.expand(context);
+ newValue = this.defaultExdr.expandString(context);
}
if (UtilValidate.isNotEmpty(this.type)) {
Modified:
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java?rev=915650&r1=915649&r2=915650&view=diff
==============================================================================
---
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java
(original)
+++
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/screen/ModelScreenAction.java
Wed Feb 24 03:31:49 2010
@@ -157,7 +157,7 @@
newValue = getInMemoryPersistedFromField(session, context);
if (Debug.verboseOn()) Debug.logVerbose("In user getting
value for field from [" + this.fromField.getOriginalName() + "]: " + newValue,
module);
} else if (!this.valueExdr.isEmpty()) {
- newValue = this.valueExdr.expand(context);
+ newValue = this.valueExdr.expandString(context);
}
} else if (this.fromScope != null &&
this.fromScope.equals("application")) {
if (!this.fromField.isEmpty()) {
@@ -165,20 +165,20 @@
newValue = getInMemoryPersistedFromField(servletContext,
context);
if (Debug.verboseOn()) Debug.logVerbose("In application
getting value for field from [" + this.fromField.getOriginalName() + "]: " +
newValue, module);
} else if (!this.valueExdr.isEmpty()) {
- newValue = this.valueExdr.expand(context);
+ newValue = this.valueExdr.expandString(context);
}
} else {
if (!this.fromField.isEmpty()) {
newValue = this.fromField.get(context);
if (Debug.verboseOn()) Debug.logVerbose("In screen getting
value for field from [" + this.fromField.getOriginalName() + "]: " + newValue,
module);
} else if (!this.valueExdr.isEmpty()) {
- newValue = this.valueExdr.expand(context);
+ newValue = this.valueExdr.expandString(context);
}
}
// If newValue is still empty, use the default value
if (ObjectType.isEmpty(newValue) && !this.defaultExdr.isEmpty()) {
- newValue = this.defaultExdr.expand(context);
+ newValue = this.defaultExdr.expandString(context);
}
if (UtilValidate.isNotEmpty(this.type)) {
