details: /erp/devel/pi/rev/2aadfe1a437c
changeset: 12579:2aadfe1a437c
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Wed Jun 01 08:50:53 2011 +0200
summary: Removed commented code and unused call to getContextInfo
details: /erp/devel/pi/rev/bc20e9ccac26
changeset: 12580:bc20e9ccac26
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Wed Jun 01 08:51:39 2011 +0200
summary: Fixes issue 17321: Use AdvancedCriteria in picklist
diffstat:
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
| 22 +-----
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js
| 38 ++++++---
2 files changed, 25 insertions(+), 35 deletions(-)
diffs (108 lines):
diff -r ffc24c6b1780 -r bc20e9ccac26
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
---
a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
Tue May 31 21:35:20 2011 +0200
+++
b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
Wed Jun 01 08:51:39 2011 +0200
@@ -191,23 +191,6 @@
gridField.filterEditorProperties.showTitle = false;
gridField.filterEditorProperties.selectorWindow = selectorWindow;
gridField.filterEditorProperties.textMatchStyle =
selectorWindow.selector.popupTextMatchStyle;
-
- // add the icon on the right to the other icons
- // var icons = gridField.filterEditorProperties.icons;
- // var iconsLength = icons.length;
- // icons[iconsLength] = {
- // showDown: true,
- // showDownIcon: true,
- // showFocused: true,
- // showOver: true,
- // src:
'[SKINIMG]../../org.openbravo.client.application/images/form/filterClear.png',
- // // note unsupportedfeature:
- // // http://forums.smartclient.com/showthread.php?p=34868
- // width: 15,
- // height: 15,
- // hspace: 0,
- // click: clickFunction
- // };
}
},
@@ -502,8 +485,7 @@
requestProperties.params[OB.Constants.ORG_PARAMETER] =
requestProperties.params.inpadOrgId;
}
- var criteria = this.getPickListFilterCriteria(),
- i;
+ var criteria = this.getPickListFilterCriteria(), i;
for (i = 0; i < criteria.criteria.length; i++) {
if (criteria.criteria[i].fieldName === this.displayField) {
// for the suggestion box it is one big or
@@ -534,8 +516,6 @@
_constructor: 'AdvancedCriteria',
criteria:[]};
- var contextInfo = this.form.view.getContextInfo(false, true);
-
// add a dummy criteria to force a fetch
criteria.criteria.push(isc.OBRestDataSource.getDummyCriterion());
diff -r ffc24c6b1780 -r bc20e9ccac26
modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js
---
a/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js
Tue May 31 21:35:20 2011 +0200
+++
b/modules/org.openbravo.userinterface.selector/web/org.openbravo.userinterface.selector/js/ob-selector-widget.js
Wed Jun 01 08:51:39 2011 +0200
@@ -662,16 +662,25 @@
this.selector.checkDefaultValidations(form, item);
},
getPickListFilterCriteria : function() {
+ var defValue, prop, i,
+ criteria = {
+ operator: 'or',
+ _constructor: 'AdvancedCriteria',
+ criteria:[]
+ };
- var criteria = this.Super('getPickListFilterCriteria'),
defValue, prop, i;
-
- if (!criteria) {
- criteria = {};
- }
+
criteria.criteria.push(isc.OBRestDataSource.getDummyCriterion());
// also adds the special ORG parameter
OB.Utilities.addFormInputsToCriteria(criteria);
+ criteria.criteria.push({
+ fieldName: this.displayField,
+ operator: 'iContains',
+ value: this.getDisplayValue()
+ });
+
+
// adds the selector id to filter used to get filter
information
criteria._selectorDefinitionId =
this.selector.selectorDefinitionId;
@@ -680,17 +689,18 @@
// the displayField filter is not passed when
// the user clicks the
// drop-down button
- if (criteria[this.displayField]) {
- for (i = 0; i < this.selector.extraSearchFields.length; i++)
{
- if (!criteria[this.selector.extraSearchFields[i]]) {
- criteria[this.selector.extraSearchFields[i]] = this
- .getDisplayValue();
- }
+ for (i = 0; i < this.selector.extraSearchFields.length; i++) {
+ if (!criteria[this.selector.extraSearchFields[i]]) {
+ criteria.criteria.push({
+ fieldName: this.selector.extraSearchFields[i],
+ operator: 'iContains',
+ value: this.getDisplayValue()
+ });
}
+ }
- // for the suggestion box it is one big or
- criteria[OB.Constants.OR_EXPRESSION] = 'true';
- }
+ // for the suggestion box it is one big or
+ criteria[OB.Constants.OR_EXPRESSION] = 'true';
// the additional where clause
criteria[OB.Constants.WHERE_PARAMETER] =
this.selector.whereClause;
------------------------------------------------------------------------------
Simplify data backup and recovery for your virtual environment with vRanger.
Installation's a snap, and flexible recovery options mean your data is safe,
secure and there when you need it. Data protection magic?
Nope - It's vRanger. Get your free trial download today.
http://p.sf.net/sfu/quest-sfdev2dev
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
