details: /erp/devel/pi/rev/6b16a29f59f7
changeset: 9821:6b16a29f59f7
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Fri Jan 14 18:12:59 2011 +0100
summary: Remove unnecesary comboreload property as the current value should
be preserved even in comboreload
diffstat:
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
| 3 ---
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
| 6 ++----
2 files changed, 2 insertions(+), 7 deletions(-)
diffs (43 lines):
diff -r ffb9d2dfde48 -r 6b16a29f59f7
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
Fri Jan 14 17:29:32 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Fri Jan 14 18:12:59 2011 +0100
@@ -140,9 +140,6 @@
}
}
}
- if (mode.equals("CHANGE")) {
- RequestContext.get().setRequestParameter("comboreload", "true");
- }
HashMap<String, JSONObject> columnValues = new HashMap<String,
JSONObject>();
HashMap<String, Field> columnsOfFields = new HashMap<String, Field>();
ArrayList<String> allColumns = new ArrayList<String>();
diff -r ffb9d2dfde48 -r 6b16a29f59f7
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
Fri Jan 14 17:29:32 2011 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java
Fri Jan 14 18:12:59 2011 +0100
@@ -321,8 +321,6 @@
RequestContext rq = RequestContext.get();
VariablesSecureApp vars = rq.getVariablesSecureApp();
- boolean comboreload = rq.getRequestParameter("comboreload") != null
- && rq.getRequestParameter("comboreload").equals("true");
String ref = field.getColumn().getReference().getId();
String objectReference = "";
if (field.getColumn().getReferenceSearchKey() != null) {
@@ -352,7 +350,7 @@
clientList, 0);
FieldProvider tabData = generateTabData(field.getTab().getADFieldList(),
field, columnValue);
comboTableData.fillParameters(tabData,
field.getTab().getWindow().getId(), columnValue);
- FieldProvider[] fps = comboTableData.select(getValueFromSession &&
!comboreload);
+ FieldProvider[] fps = comboTableData.select(getValueFromSession);
ArrayList<FieldProvider> values = new ArrayList<FieldProvider>();
values.addAll(Arrays.asList(fps));
ArrayList<JSONObject> comboEntries = new ArrayList<JSONObject>();
@@ -372,7 +370,7 @@
comboEntries.add(entry);
}
JSONObject fieldProps = new JSONObject();
- if (getValueFromSession && !comboreload) {
+ if (getValueFromSession) {
fieldProps.put("value", columnValue);
} else {
if (possibleIds.contains(columnValue)) {
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
