Le 22/02/2010 17:34, doo...@apache.org a écrit :
Author: doogie
Date: Mon Feb 22 16:34:47 2010
New Revision: 912645
URL: http://svn.apache.org/viewvc?rev=912645&view=rev
Log:
Make use of FSE.expand(), instead of expandString, to provide support
for direct setting of values in widgets. This closes OFBIZ-3486.
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=912645&r1=912644&r2=912645&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
Mon Feb 22 16:34:47 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.expandString(context);
+ newValue = this.valueExdr.expand(context);
}
// If newValue is still empty, use the default value
if (ObjectType.isEmpty(newValue)&& !this.defaultExdr.isEmpty()) {
- newValue = this.defaultExdr.expandString(context);
+ newValue = this.defaultExdr.expand(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=912645&r1=912644&r2=912645&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
Mon Feb 22 16:34:47 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.expandString(context);
+ newValue = this.valueExdr.expand(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.expandString(context);
+ newValue = this.valueExdr.expand(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.expandString(context);
+ newValue = this.valueExdr.expand(context);
}
}
// If newValue is still empty, use the default value
if (ObjectType.isEmpty(newValue)&& !this.defaultExdr.isEmpty()) {
- newValue = this.defaultExdr.expandString(context);
+ newValue = this.defaultExdr.expand(context);
}
if (UtilValidate.isNotEmpty(this.type)) {
Since this commit, it's impossible to connect to AP and AF applications !
--
Erwan de FERRIERES
www.nereide.biz
