details: /erp/devel/pi/rev/f86ffe5c4524
changeset: 11111:f86ffe5c4524
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Tue Mar 08 17:37:32 2011 +0100
summary: Issue 15751: Changed way of generating in-fields metadata
details: /erp/devel/pi/rev/1e4f6fe09807
changeset: 11112:1e4f6fe09807
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Tue Mar 08 17:38:14 2011 +0100
summary: Fixes issue 15751: Fixes in-field values as GET parameter
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
| 11 +++----
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKSearchUIDefinition.java
| 14 ++++++---
2 files changed, 14 insertions(+), 11 deletions(-)
diffs (77 lines):
diff -r fb8d3320754b -r 1e4f6fe09807
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Tue Mar 08 16:51:39 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Tue Mar 08 17:38:14 2011 +0100
@@ -104,7 +104,7 @@
isc.OBSearchItem.openedWindow.close();
isc.OBSearchItem.openSearchItem = null;
};
-}(this));
+}(this)); // window
isc.OBSearchItem.addProperties({
operator: 'iContains',
@@ -196,11 +196,10 @@
values = view.getContextInfo(false, true, true, true);
length = this.inFields.length;
for (i = 0; i < length; i++) {
- inpName = this.inFields[i];
+ inpName = this.inFields[i].columnName;
propDef = view.getPropertyDefinitionFromInpColumnName(inpName);
- if (propDef && values[inpName]) {
- // note the name passed is not the same as the inp name, it is inp +
dbcolumn
- parameters[index++] = 'inp' + propDef.dbColumn;
+ if (propDef && values[inpName]) {
+ parameters[index++] = this.inFields[i].parameterName;
parameters[index++] = values[inpName];
// and to be save also pass the value as the input name
parameters[index++] = inpName;
@@ -209,7 +208,7 @@
}
this.openSearchWindow(this.searchUrl, parameters, this.getValue());
},
-
+
openSearchWindow: function(url, parameters, strValueID){
var height, width, top, left;
var complementsNS4 = '';
diff -r fb8d3320754b -r 1e4f6fe09807
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKSearchUIDefinition.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKSearchUIDefinition.java
Tue Mar 08 16:51:39 2011 +0100
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKSearchUIDefinition.java
Tue Mar 08 17:38:14 2011 +0100
@@ -29,6 +29,7 @@
import org.openbravo.base.structure.BaseOBObject;
import org.openbravo.client.kernel.KernelUtils;
import org.openbravo.dal.service.OBDal;
+import org.openbravo.data.Sqlc;
import org.openbravo.model.ad.domain.ModelImplementation;
import org.openbravo.model.ad.domain.ModelImplementationMapping;
import org.openbravo.model.ad.domain.Reference;
@@ -119,21 +120,24 @@
// TODO: warn
return superJsonStr;
}
- final List<String> inFields = new ArrayList<String>();
+ final JSONArray inFields = new JSONArray();
final List<String> outFields = new ArrayList<String>();
for (SelectorColumn selectorColumn : selector.getADSelectorColumnList())
{
if (selectorColumn.isActive()) {
- String columnName = selectorColumn.getName()
+ String columnName = selectorColumn.getDBColumnName()
+ (selectorColumn.getSuffix() != null ?
selectorColumn.getSuffix() : "");
- columnName = "inp" + columnName;
+ columnName = "inp" + Sqlc.TransformaNombreColumna(columnName);
if (selectorColumn.getColumnType().equals("I")) {
- inFields.add(columnName);
+ JSONObject inField = new JSONObject();
+ inField.put("columnName", columnName);
+ inField.put("parameterName", "inp" + selectorColumn.getName());
+ inFields.put(inField);
} else {
outFields.add(columnName);
}
}
}
- json.put("inFields", new JSONArray(inFields));
+ json.put("inFields", inFields);
json.put("outFields", new JSONArray(outFields));
return json.toString();
------------------------------------------------------------------------------
What You Don't Know About Data Connectivity CAN Hurt You
This paper provides an overview of data connectivity, details
its effect on application quality, and explores various alternative
solutions. http://p.sf.net/sfu/progress-d2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
