details: https://code.openbravo.com/erp/devel/main/rev/77a0c3b68f2c changeset: 19005:77a0c3b68f2c user: Martin Taal <martin.taal <at> openbravo.com> date: Tue Dec 11 22:12:54 2012 +0100 summary: Fixes issue 22511: FK drop down filters in P&E windows cannot be selected Use addProperties in the correct way, without overwriting the checkboxFieldDefaults.
details: https://code.openbravo.com/erp/devel/main/rev/43b65ce2ab73 changeset: 19006:43b65ce2ab73 user: Martin Taal <martin.taal <at> openbravo.com> date: Tue Dec 11 22:15:20 2012 +0100 summary: Fixes issue 22511: FK drop down filters in P&E windows cannot be selected Make a real copy of the original properties in addProperties diffstat: modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js | 6 +++--- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js | 2 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diffs (64 lines): diff -r 3b1b5e2f6c63 -r 43b65ce2ab73 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js Tue Dec 11 17:36:49 2012 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/alert-management/ob-alert-grid.js Tue Dec 11 22:15:20 2012 +0100 @@ -105,7 +105,7 @@ initWidget: function () { // added for showing counts in the filtereditor row - this.checkboxFieldDefaults = isc.addProperties(this.checkboxFieldDefaults, { + this.checkboxFieldProperties = isc.addProperties({}, this.checkboxFieldProperties || {}, { canFilter: true, //frozen: true, /* Removed due to issue https://issues.openbravo.com/view.php?id=17611 */ canFreeze: true, diff -r 3b1b5e2f6c63 -r 43b65ce2ab73 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js Tue Dec 11 17:36:49 2012 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/formitem/ob-formitem-minidaterange.js Tue Dec 11 22:15:20 2012 +0100 @@ -105,7 +105,7 @@ blur: function () { var blurValue = this.blurValue(), newBlurValue = '', - digitRegExp = new RegExp('^\\d+$', 'gm'), + jsValue, digitRegExp = new RegExp('^\\d+$', 'gm'), newValue, i; if (!this.areDateItemPropertiesSet) { @@ -236,7 +236,7 @@ // MiniDateRangeItem to make it editable. isc.ClassFactory.defineClass('OBMiniDateRangeItem', isc.OBTextItem); -isc.OBMiniDateRangeItem.addProperties(OB.DateItemProperties, { +isc.OBMiniDateRangeItem.addProperties({}, OB.DateItemProperties, { validateOnExit: false, showPickerIcon: false, filterOnKeypress: false, @@ -633,4 +633,4 @@ formatDate: function (dt) { return OB.Utilities.Date.JSToOB(dt, OB.Format.date); } -}); \ No newline at end of file +}); diff -r 3b1b5e2f6c63 -r 43b65ce2ab73 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Tue Dec 11 17:36:49 2012 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Tue Dec 11 22:15:20 2012 +0100 @@ -361,7 +361,7 @@ this.editFormDefaults = isc.addProperties({}, isc.clone(OB.ViewFormProperties), this.editFormDefaults); // added for showing counts in the filtereditor row - this.checkboxFieldDefaults = isc.addProperties(this.checkboxFieldDefaults, { + this.checkboxFieldProperties = isc.addProperties({}, this.checkboxFieldProperties | {}, { canFilter: true, // frozen is much nicer, but check out this forum discussion: // http://forums.smartclient.com/showthread.php?p=57581 diff -r 3b1b5e2f6c63 -r 43b65ce2ab73 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js Tue Dec 11 17:36:49 2012 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/process/ob-pick-and-execute-grid.js Tue Dec 11 22:15:20 2012 +0100 @@ -107,7 +107,7 @@ this.orderByClause = this.gridProperties.orderByClause; - this.checkboxFieldDefaults = isc.addProperties(this.checkboxFieldDefaults, { + this.checkboxFieldProperties = isc.addProperties({}, this.checkboxFieldProperties | {}, { canFilter: true, frozen: true, canFreeze: true, ------------------------------------------------------------------------------ LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial Remotely access PCs and mobile devices and provide instant support Improve your efficiency, and focus on delivering more value-add services Discover what IT Professionals Know. Rescue delivers http://p.sf.net/sfu/logmein_12329d2d _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
