details: https://code.openbravo.com/erp/devel/pi/rev/ea3c09846afd
changeset: 35909:ea3c09846afd
user: Carlos Aristu <carlos.aristu <at> openbravo.com>
date: Tue May 28 18:48:54 2019 +0200
summary: fixes bug 40721: Mandatory field in P&E grids not correctly checked
There was a wrong condition when checking if the mandatory fields in a record
of a P&E grid. Fixing it together with minor improvements:
- Deleted wrong condition to check undefined value: "record[fields[j] ===
undef]"
- Use "!record[fields[j].name]" expression to check if the value is null or
undefined
- Avoid unnecessary nested "if"
- Use "!lineNumbers" instead of "lineNumbers === undef"
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js
| 16 ++++-----
1 files changed, 7 insertions(+), 9 deletions(-)
diffs (33 lines):
diff -r b7769c78ea10 -r ea3c09846afd
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js
Tue May 28 11:06:02 2019 +0000
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-pickeditgrid.js
Tue May 28 18:48:54 2019 +0200
@@ -31,7 +31,7 @@
condition: function (item) {
var grid = item.canvas.viewGrid,
hasErrors = false,
- undef, i, j, fields, selection, len, record, lineNumbers;
+ i, j, fields, selection, len, record, lineNumbers;
grid.endEditing();
fields = grid.getFields();
selection = grid.getSelectedRecords() || [];
@@ -39,14 +39,12 @@
for (i = 0; i < len; i++) {
record = grid.getEditedRecord(grid.getRecordIndex(selection[i]));
for (j = 0; j < fields.length; j++) {
- if (fields[j].required) {
- if (record[fields[j].name] === null || record[fields[j].name] ===
'' || record[fields[j] === undef]) {
- hasErrors = true;
- if (lineNumbers === undef) {
- lineNumbers = grid.getRecordIndex(selection[i]).toString();
- } else {
- lineNumbers = lineNumbers + ',' +
grid.getRecordIndex(selection[i]).toString();
- }
+ if (fields[j].required && (!record[fields[j].name] ||
record[fields[j].name] === '')) {
+ hasErrors = true;
+ if (!lineNumbers) {
+ lineNumbers = grid.getRecordIndex(selection[i]).toString();
+ } else {
+ lineNumbers = lineNumbers + ',' +
grid.getRecordIndex(selection[i]).toString();
}
}
}
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
