details: https://code.openbravo.com/erp/devel/pi/rev/7b227385bb5f
changeset: 19009:7b227385bb5f
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 (59 lines):
diff -r 15f13c86e457 -r 7b227385bb5f
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 22:12:54 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.checkboxFieldProperties =
isc.addProperties(this.checkboxFieldProperties || {}, {
+ 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 15f13c86e457 -r 7b227385bb5f
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 22:12:54 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
@@ -104,8 +104,8 @@
blur: function () {
var blurValue = this.blurValue(),
- newBlurValue = '', jsValue,
- digitRegExp = new RegExp('^\\d+$', 'gm'),
+ newBlurValue = '',
+ jsValue, digitRegExp = new RegExp('^\\d+$', 'gm'),
newValue, i;
if (!this.areDateItemPropertiesSet) {
@@ -241,7 +241,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,
diff -r 15f13c86e457 -r 7b227385bb5f
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 22:12:54 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
@@ -369,7 +369,7 @@
this.editFormDefaults = isc.addProperties({},
isc.clone(OB.ViewFormProperties), this.editFormDefaults);
// added for showing counts in the filtereditor row
- this.checkboxFieldProperties =
isc.addProperties(this.checkboxFieldProperties | {}, {
+ 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 15f13c86e457 -r 7b227385bb5f
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 22:12:54 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.checkboxFieldProperties =
isc.addProperties(this.checkboxFieldProperties | {}, {
+ 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
