details: /erp/devel/pi/rev/cd7e140444d7
changeset: 11229:cd7e140444d7
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Mon Mar 14 17:53:54 2011 +0100
summary: Fixed issue 16263. Export CSV will no longer crash when windowId is
null
details: /erp/devel/pi/rev/514ace302561
changeset: 11230:514ace302561
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Mon Mar 14 17:59:04 2011 +0100
summary: Fixed issue 16244. Callouts will now also be executed when a
ComboReload triggered by a FIC request in CHANGE mode occurs.
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
| 2 +-
modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
| 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diffs (26 lines):
diff -r e7afa9750407 -r 514ace302561
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Mon Mar 14 17:37:26 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Mon Mar 14 17:59:04 2011 +0100
@@ -424,7 +424,7 @@
// (due to how ComboReloads worked, callouts were always called)
if (columnValues.get("inp"
+ Sqlc.TransformaNombreColumna(field.getColumn().getDBColumnName()))
!= null) {
- if (mode.equals("NEW")
+ if ((mode.equals("NEW") || mode.equals("CHANGE"))
&& (uiDef instanceof EnumUIDefinition || uiDef instanceof
FKComboUIDefinition)
&& field.getColumn().isValidateOnNew()) {
if (field.getColumn().getCallout() != null) {
diff -r e7afa9750407 -r 514ace302561
modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
---
a/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
Mon Mar 14 17:37:26 2011 +0100
+++
b/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java
Mon Mar 14 17:59:04 2011 +0100
@@ -650,7 +650,9 @@
String suffix = restOfClause.substring(secondAtIndex + 1);
String param = restOfClause.substring(0, secondAtIndex);
String paramValue = Utility.getContext(new DalConnectionProvider(false),
RequestContext.get()
- .getVariablesSecureApp(), param,
RequestContext.get().getRequestParameter("windowId"));
+ .getVariablesSecureApp(), param,
+ RequestContext.get().getRequestParameter("windowId") != null ?
RequestContext.get()
+ .getRequestParameter("windowId") : "");
localWhereClause = prefix + getTypedParameterAlias() + suffix;
typedParameters.add(paramValue);
}
------------------------------------------------------------------------------
Colocation vs. Managed Hosting
A question and answer guide to determining the best fit
for your organization - today and in the future.
http://p.sf.net/sfu/internap-sfd2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
