details: https://code.openbravo.com/erp/devel/main/rev/b70cd891bd28 changeset: 13965:b70cd891bd28 user: Martin Taal <martin.taal <at> openbravo.com> date: Thu Oct 13 14:11:48 2011 +0200 summary: Fixes issue 18771: Form layoutter doesn't work ok
details: https://code.openbravo.com/erp/devel/main/rev/d70a5e662ec8 changeset: 13966:d70a5e662ec8 user: Martin Taal <martin.taal <at> openbravo.com> date: Thu Oct 13 09:45:36 2011 +0200 summary: Related to issue 18767: More filter expressions that do not work Fix # and disappearing of count in grid diffstat: 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/personalization/ob-personalize-form.js | 2 +- modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java | 14 +++++---- 3 files changed, 11 insertions(+), 7 deletions(-) diffs (56 lines): diff -r cebb5684e24f -r d70a5e662ec8 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 Thu Oct 13 11:36:28 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js Thu Oct 13 09:45:36 2011 +0200 @@ -714,6 +714,7 @@ } if (this.filterEditor && this.filterEditor.getEditForm()) { this.filterEditor.getEditForm().setValue(isc.OBViewGrid.EDIT_LINK_FIELD_NAME, newValue); + this.filterEditor.getEditForm().getField(isc.OBViewGrid.EDIT_LINK_FIELD_NAME).defaultValue = newValue; } }, @@ -1380,6 +1381,7 @@ } if (this.filterEditor) { this.filterEditor.getEditForm().setValue(this.getCheckboxField().name, newValue); + this.filterEditor.getEditForm().getField(this.getCheckboxField().name).defaultValue = newValue; } }, diff -r cebb5684e24f -r d70a5e662ec8 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js Thu Oct 13 11:36:28 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/personalization/ob-personalize-form.js Thu Oct 13 09:45:36 2011 +0200 @@ -751,7 +751,7 @@ this.formLayout.addMember(statusBar); // create the form and add it to the formLayout - this.previewForm = isc.OBViewForm.create(this.previewFormProperties, { + this.previewForm = isc.OBViewForm.create(isc.clone(OB.ViewFormProperties), this.previewFormProperties, { preventAllEvents: true, statusBar: statusBar, personalizeForm: this, diff -r cebb5684e24f -r d70a5e662ec8 modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java --- a/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java Thu Oct 13 11:36:28 2011 +0200 +++ b/modules/org.openbravo.service.json/src/org/openbravo/service/json/AdvancedQueryBuilder.java Thu Oct 13 09:45:36 2011 +0200 @@ -308,13 +308,15 @@ // create the clauses, re-uses the code in parseSimpleClause // which translates a lesserthan/greater than to the end/start // time of a date - if (operator.equals(OPERATOR_EQUALS)) { - return "(" + parseSimpleClause(fieldName, OPERATOR_GREATEROREQUAL, value) + " and " - + parseSimpleClause(fieldName, OPERATOR_LESSOREQUAL, value) + ")"; + if (property.isDate() || property.isDatetime()) { + if (operator.equals(OPERATOR_EQUALS)) { + return "(" + parseSimpleClause(fieldName, OPERATOR_GREATEROREQUAL, value) + " and " + + parseSimpleClause(fieldName, OPERATOR_LESSOREQUAL, value) + ")"; - } else { - return "(" + parseSimpleClause(fieldName, OPERATOR_GREATEROREQUALFIELD, value) + " and " - + parseSimpleClause(fieldName, OPERATOR_LESSOREQUALFIElD, value) + ")"; + } else { + return "(" + parseSimpleClause(fieldName, OPERATOR_GREATEROREQUALFIELD, value) + " and " + + parseSimpleClause(fieldName, OPERATOR_LESSOREQUALFIElD, value) + ")"; + } } } ------------------------------------------------------------------------------ All the data continuously generated in your IT infrastructure contains a definitive record of customers, application performance, security threats, fraudulent activity and more. Splunk takes this data and makes sense of it. Business sense. IT sense. Common sense. http://p.sf.net/sfu/splunk-d2d-oct _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
