details: https://code.openbravo.com/erp/devel/pi/rev/e6e46782e850
changeset: 20501:e6e46782e850
user: Shankar Balachandran <shankar.balachandran <at> openbravo.com>
date: Thu May 30 18:06:34 2013 +0530
summary: Related to Issue 23925 : Jslint changes
added condition to ignore regex criteria while setting symbol and made
modifications in code for jslint compliance
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js
| 13 ++++++---
1 files changed, 8 insertions(+), 5 deletions(-)
diffs (27 lines):
diff -r 7331622675df -r e6e46782e850
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js
Thu May 30 13:35:27 2013 +0200
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js
Thu May 30 18:06:34 2013 +0530
@@ -274,15 +274,18 @@
if (criteria && criteria.length && criterion.operator === 'or') {
for (i = 0; i < criteria.length; i++) {
operators = isc.DataSource.getSearchOperators();
- if (criteria[i].operator !== "iContains" && criteria[i].operator !==
"contains") {
+ //handles case where column filter symbols are removed. Refer Issue
https://issues.openbravo.com/view.php?id=23925
+ if (criteria[i].operator !== "iContains" && criteria[i].operator !==
"contains" && criteria[i].operator !== "regexp") {
for (operator in operators) {
- if (operators[operator].ID === criteria[i].operator &&
operators[operator].symbol && criteria[i].value &&
criteria[i].value.indexOf(operators[operator].symbol) === -1) {
- values.push(operators[operator].symbol + criteria[i].value);
- valueSet = true;
+ if (operators.hasOwnProperty(operator)) {
+ if (operators[operator].ID === criteria[i].operator &&
operators[operator].symbol && criteria[i].value &&
criteria[i].value.indexOf(operators[operator].symbol) === -1) {
+ values.push(operators[operator].symbol + criteria[i].value);
+ valueSet = true;
+ }
}
}
}
- if (valueSet == false) {
+ if (valueSet === false) {
values.push(criteria[i].value);
}
valueSet = false;
------------------------------------------------------------------------------
Introducing AppDynamics Lite, a free troubleshooting tool for Java/.NET
Get 100% visibility into your production application - at no cost.
Code-level diagnostics for performance bottlenecks with <2% overhead
Download for free and get started troubleshooting in minutes.
http://p.sf.net/sfu/appdyn_d2d_ap1
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
