details: https://code.openbravo.com/erp/devel/main/rev/5f2410ceb9ad
changeset: 25160:5f2410ceb9ad
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Dec 16 14:57:28 2014 +0100
summary: fixed bug 28386: FK filter dropdown hides elements when it's reopened
When a FK filter drop down was reopened after having selected an element, it
only displayed that element in the list.
Few things have been fixed:
* When requesting datasource for FK drop down, the same criteria used in the
grid is used, but removing that drop down criterion. This was not properly
done for direct FK selection
* == element before the identifier was some times removed
* When reopening a drop down having an element selected, the criteria was
changed
from equals with FK value to iEquals with identifier value
details: https://code.openbravo.com/erp/devel/main/rev/801318946d70
changeset: 25161:801318946d70
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Wed Dec 17 17:14:25 2014 +0100
summary: fixed bug 28386: keep selected item when reopening FK drop down
diffstat:
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js
| 87 +++++++--
1 files changed, 68 insertions(+), 19 deletions(-)
diffs (156 lines):
diff -r f15df074a510 -r 801318946d70
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
Mon Dec 01 16:50:51 2014 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-fk-filter.js
Wed Dec 17 17:14:25 2014 +0100
@@ -125,15 +125,30 @@
// place after the first item was selected.
// This first selection happens in ScrollingMenu.dataChanged
dataArrived: function (startRow, endRow) {
- var record, rowNum, i, values = this.formItem.getValue();
+ var record, rowNum, i, values = this.formItem.getValue(),
+ fixedValues = [],
+ value;
this.Super('dataArrived', arguments);
if (values) {
if (!isc.isA.Array(values)) {
values = [values];
}
+
+ // fix selected values before checking them in the data to re-select
them
+ for (i = 0; i < values.length; i++) {
+ value = values[i];
+ if (isc.isAn.Array(value)) {
+ value = value[0];
+ }
+ fixedValues.push(value.startsWith('==') ? value.substring(2) :
value);
+ }
+
for (rowNum = startRow; rowNum < (endRow + 1); rowNum++) {
record = this.getRecord(rowNum);
- if (record && values.contains(record[me.displayField])) {
+ if (record && fixedValues.contains(record[me.displayField])) {
+ // selectRecord asynchronously invokes handleChanged, this
should be
+ // managed as when the value is picked from the list by pickValue
+ this.formItem._pickingArrivedValue = true;
this.selectRecord(record, true);
}
}
@@ -192,18 +207,15 @@
}
if (value && isc.isA.Array(value) && value.length > 0 && rows) {
for (i = 0; i < value.length; i++) {
- if (value[i].indexOf('==') === 0) {
- value[i] = value[i].substring(2, value[i].length);
- if (rows.find('name', value[i]) === undefined) {
- performFetch = true;
- }
+ if (value[i].indexOf('==') === 0 && rows.find('name',
value[i].substring(2, value[i].length)) === undefined) {
+ performFetch = true;
+ break;
}
}
- } else {
- if (rows && rows.find('name', value)) {
- performFetch = true;
- }
+ } else if (rows && rows.find('name', value)) {
+ performFetch = true;
}
+
if (performFetch) {
this.Super('handleEditorExit', arguments);
} else {
@@ -294,7 +306,31 @@
getPickListFilterCriteria: function () {
var forceFilterByIdentifier = true,
pickListCriteria = this.getCriterion(null, forceFilterByIdentifier),
- gridCriteria, i, criteriaFieldName = this.getCriteriaFieldName();
+ gridCriteria, criteriaFieldName = this.getCriteriaFieldName(),
+ me = this;
+
+ function cleanCriteria(crit, fkItem) {
+ var i, criterion, fkFilterOnThisField;
+ for (i = crit.length - 1; i >= 0; i--) {
+ criterion = crit[i];
+ if (criterion.criteria && isc.isAn.Array(criterion.criteria)) {
+ // nested criterion, clean inside
+ cleanCriteria(criterion.criteria);
+ continue;
+ }
+
+ fkFilterOnThisField = criterion.operator === 'equals' &&
criterion.fieldName === me.name;
+
+ if (fkFilterOnThisField || (criteriaFieldName ===
criterion.fieldName)) {
+ crit.removeAt(i);
+ }
+
+ if (me.grid && me.grid.parentElement &&
me.grid.parentElement.getClassName() === 'OBPickAndExecuteGrid' &&
criterion.fieldName === 'id') {
+ // we're in a P&E grid, selected ids should also be removed from
criteria
+ crit.removeAt(i);
+ }
+ }
+ }
if (this.form.grid.sourceWidget.lazyFiltering) {
// Fetch the criteria from the current values of the filter editor
@@ -310,12 +346,9 @@
};
gridCriteria.criteria = gridCriteria.criteria || [];
- for (i = 0; i < gridCriteria.criteria.length; i++) {
- if (criteriaFieldName === gridCriteria.criteria[i].fieldName) {
- gridCriteria.criteria.removeAt(i);
- break;
- }
- }
+ // remove from criteria the field used for current filter so drop down
doesn't
+ // restrict its values
+ cleanCriteria(gridCriteria.criteria);
// when in refresh picklist the user is typing
// a value, filter using that
@@ -555,7 +588,7 @@
},
handleChanged: function (value) {
- if (!this.grid.sourceWidget.alwaysFilterFksByIdentifier &&
(this._pickingValue || this.allowFkFilterByIdentifier === false)) {
+ if (!this.grid.sourceWidget.alwaysFilterFksByIdentifier &&
(this._pickingValue || this._pickingArrivedValue ||
this.allowFkFilterByIdentifier === false)) {
// if the filter text has changed because a value has been ficked from
the filter drop down, use the id filter
// do this also if the only filter type allowed is 'id'
this.filterType = 'id';
@@ -563,6 +596,11 @@
// otherwise use the standard filter using the record identifier
this.filterType = 'identifier';
}
+ if (this._pickingArrivedValue) {
+ // changed caused by showing the pick list having a value previously
selected
+ // as it is invoked asynchronously, remove flag here
+ delete this._pickingArrivedValue;
+ }
this.Super('handleChanged', arguments);
},
@@ -574,6 +612,10 @@
if (values && this.filterType === 'id') {
for (i = 0; i < values.length; i++) {
value = values[i];
+ if (isc.isAn.Array(value)) {
+ // when "or" criteria value is an array of 1 element
+ value = value[0];
+ }
if (value.startsWith('==')) {
// if the value has the equals operator prefix, get rid of it
value = value.substring(2);
@@ -601,6 +643,13 @@
} else if (this.filterAuxCache &&
this.filterAuxCache.find(OB.Constants.IDENTIFIER, identifier)) {
records = this.filterAuxCache.findAll(OB.Constants.IDENTIFIER,
identifier);
}
+
+ if (!records) {
+ // it is possible not to have any records in case of multitple items
selected in current criteria,
+ // after that another criteria is added making some of current one not
to apply anymore
+ return recordIds;
+ }
+
for (i = 0; i < records.length; i++) {
recordIds.add(records[i][OB.Constants.ID]);
}
------------------------------------------------------------------------------
Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server
from Actuate! Instantly Supercharge Your Business Reports and Dashboards
with Interactivity, Sharing, Native Excel Exports, App Integration & more
Get technology previously reserved for billion-dollar corporations, FREE
http://pubads.g.doubleclick.net/gampad/clk?id=164703151&iu=/4140/ostg.clktrk
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
