details: /erp/devel/main/rev/fdba29ca6846 changeset: 10596:fdba29ca6846 user: RM packaging bot <staff.rm <at> openbravo.com> date: Sun Feb 13 19:31:45 2011 +0100 summary: CI: merge back from main
details: /erp/devel/main/rev/c1a5461023c8 changeset: 10597:c1a5461023c8 user: Martin Taal <martin.taal <at> openbravo.com> date: Sun Feb 13 23:26:38 2011 +0100 summary: Implicit filter enabled did not give correct empty data message details: /erp/devel/main/rev/101e6175fe4f changeset: 10598:101e6175fe4f user: Martin Taal <martin.taal <at> openbravo.com> date: Sun Feb 13 23:30:47 2011 +0100 summary: Support refresh of parent record when adding/changing lines details: /erp/devel/main/rev/6f1d4a1ba2db changeset: 10599:6f1d4a1ba2db user: RM packaging bot <staff.rm <at> openbravo.com> date: Mon Feb 14 00:37:55 2011 +0100 summary: CI: update AD_MODULE to version 10598 diffstat: modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 8 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js | 3 + modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view-datasource.js | 92 ++++----- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js | 45 ++++- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js | 21 +- modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js | 8 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.htmlwidget/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.kernel/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.myob/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 4 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.client.querylist/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.financial.paymentreport/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.reports.ordersawaitingdelivery/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.datasource/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 10 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.service.json/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.selector/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.userinterface.smartclient/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.datasets/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 6 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3.framework/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 22 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE.xml | 2 +- modules/org.openbravo.v3/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml | 12 +- src-db/database/sourcedata/AD_MODULE.xml | 2 +- 38 files changed, 180 insertions(+), 125 deletions(-) diffs (truncated from 1058 to 300 lines): diff -r c885d1e00cb2 -r 6f1d4a1ba2db modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Sun Feb 13 19:14:13 2011 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml Mon Feb 14 00:37:55 2011 +0100 @@ -6,7 +6,7 @@ <!--A918E3331C404B889D69AA9BFAFB23AC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--A918E3331C404B889D69AA9BFAFB23AC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--A918E3331C404B889D69AA9BFAFB23AC--> <NAME><![CDATA[Advanced Payables and Receivables Mngmt]]></NAME> -<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.10594]]></VERSION> +<!--A918E3331C404B889D69AA9BFAFB23AC--> <VERSION><![CDATA[3.0.10598]]></VERSION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <DESCRIPTION><![CDATA[Managing your finances with an ERP does not have to be difficult. Enjoy a radically improved user experience that combines the power of an enterprise grade financial application with the simplicity and ease of a web 2.0 personal accounting service.]]></DESCRIPTION> <!--A918E3331C404B889D69AA9BFAFB23AC--> <HELP><![CDATA[Advanced Payables and Receivables Management simplifies and automates the business processes around the management of financial accounts, from the receipt and issue of payment, to the reconciliation of those events with bank statements. If you would like to help shape this module you are welcome to take part in the forum discussions or register feature requests or issues in the corresponding (Forum and Bug Tracking) sections in the Advanced Payables and Receivable project in the OB Forge.]]></HELP> diff -r c885d1e00cb2 -r 6f1d4a1ba2db modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sun Feb 13 19:14:13 2011 +0100 +++ b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Feb 14 00:37:55 2011 +0100 @@ -7,7 +7,7 @@ <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <AD_DEPENDENT_MODULE_ID><![CDATA[5EB4F15C80684ACA904756BDC12ADBE5]]></AD_DEPENDENT_MODULE_ID> -<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.10594]]></STARTVERSION> +<!--89326AE95DAD449D85DFAB2C5B1C6683--> <STARTVERSION><![CDATA[2.1.10598]]></STARTVERSION> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Selector]]></DEPENDANT_MODULE_NAME> <!--89326AE95DAD449D85DFAB2C5B1C6683--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--B97FC854C6DD41E692161585645A900F--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--B97FC854C6DD41E692161585645A900F--> <AD_MODULE_ID><![CDATA[A918E3331C404B889D69AA9BFAFB23AC]]></AD_MODULE_ID> <!--B97FC854C6DD41E692161585645A900F--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.10594]]></STARTVERSION> +<!--B97FC854C6DD41E692161585645A900F--> <STARTVERSION><![CDATA[3.0.10598]]></STARTVERSION> <!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--B97FC854C6DD41E692161585645A900F--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r c885d1e00cb2 -r 6f1d4a1ba2db modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Sun Feb 13 19:14:13 2011 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml Mon Feb 14 00:37:55 2011 +0100 @@ -6,7 +6,7 @@ <!--C70732EA90A14EC0916078B85CC33D2D--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--C70732EA90A14EC0916078B85CC33D2D--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--C70732EA90A14EC0916078B85CC33D2D--> <NAME><![CDATA[JBoss Weld]]></NAME> -<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.10594]]></VERSION> +<!--C70732EA90A14EC0916078B85CC33D2D--> <VERSION><![CDATA[1.1.10598]]></VERSION> <!--C70732EA90A14EC0916078B85CC33D2D--> <DESCRIPTION><![CDATA[JBoss Weld]]></DESCRIPTION> <!--C70732EA90A14EC0916078B85CC33D2D--> <HELP><![CDATA[Provides the JBoss Weld framework: Java Contexts and Dependency Injection for the Java EE platform (CDI). For more information see http://seamframework.org/Weld]]></HELP> <!--C70732EA90A14EC0916078B85CC33D2D--> <URL><![CDATA[http://forge.openbravo.com/projects/weld]]></URL> diff -r c885d1e00cb2 -r 6f1d4a1ba2db modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sun Feb 13 19:14:13 2011 +0100 +++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Feb 14 00:37:55 2011 +0100 @@ -7,7 +7,7 @@ <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_MODULE_ID><![CDATA[C70732EA90A14EC0916078B85CC33D2D]]></AD_MODULE_ID> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.10594]]></STARTVERSION> +<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <STARTVERSION><![CDATA[3.0.10598]]></STARTVERSION> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME> <!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r c885d1e00cb2 -r 6f1d4a1ba2db modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Sun Feb 13 19:14:13 2011 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml Mon Feb 14 00:37:55 2011 +0100 @@ -6,7 +6,7 @@ <!--9BA0836A3CD74EE4AB48753A47211BCC--> <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <NAME><![CDATA[User Interface Application]]></NAME> -<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.10594]]></VERSION> +<!--9BA0836A3CD74EE4AB48753A47211BCC--> <VERSION><![CDATA[2.1.10598]]></VERSION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <DESCRIPTION><![CDATA[Provides the main application components for the openbravo user interface]]></DESCRIPTION> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <HELP><![CDATA[Provides the main application components for the openbravo user interface. The main layout incorporates a navigation bar and a main view area.]]></HELP> <!--9BA0836A3CD74EE4AB48753A47211BCC--> <URL><![CDATA[http://forge.openbravo.com/projects/clientapplication]]></URL> diff -r c885d1e00cb2 -r 6f1d4a1ba2db modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Sun Feb 13 19:14:13 2011 +0100 +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml Mon Feb 14 00:37:55 2011 +0100 @@ -7,7 +7,7 @@ <!--15D7CE8D95D043189162DBABA54A1F61--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--15D7CE8D95D043189162DBABA54A1F61--> <AD_DEPENDENT_MODULE_ID><![CDATA[A44B9BA75C354D8FB2E3F7D6EB6BFDC4]]></AD_DEPENDENT_MODULE_ID> -<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.10594]]></STARTVERSION> +<!--15D7CE8D95D043189162DBABA54A1F61--> <STARTVERSION><![CDATA[2.1.10598]]></STARTVERSION> <!--15D7CE8D95D043189162DBABA54A1F61--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDANT_MODULE_NAME><![CDATA[JSON Datasource]]></DEPENDANT_MODULE_NAME> <!--15D7CE8D95D043189162DBABA54A1F61--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -21,7 +21,7 @@ <!--60A170212F36499D83B8AD38D01F46B3--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--60A170212F36499D83B8AD38D01F46B3--> <AD_DEPENDENT_MODULE_ID><![CDATA[4B828F4D03264080AA1D2057B13F613C]]></AD_DEPENDENT_MODULE_ID> -<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.10594]]></STARTVERSION> +<!--60A170212F36499D83B8AD38D01F46B3--> <STARTVERSION><![CDATA[2.1.10598]]></STARTVERSION> <!--60A170212F36499D83B8AD38D01F46B3--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDANT_MODULE_NAME><![CDATA[User Interface Client Kernel]]></DEPENDANT_MODULE_NAME> <!--60A170212F36499D83B8AD38D01F46B3--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -35,7 +35,7 @@ <!--824D60CB352E4099B1D8C903CA139DAE--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--824D60CB352E4099B1D8C903CA139DAE--> <AD_DEPENDENT_MODULE_ID><![CDATA[0]]></AD_DEPENDENT_MODULE_ID> -<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.10594]]></STARTVERSION> +<!--824D60CB352E4099B1D8C903CA139DAE--> <STARTVERSION><![CDATA[3.0.10598]]></STARTVERSION> <!--824D60CB352E4099B1D8C903CA139DAE--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME> <!--824D60CB352E4099B1D8C903CA139DAE--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> @@ -49,7 +49,7 @@ <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISACTIVE><![CDATA[Y]]></ISACTIVE> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_MODULE_ID><![CDATA[9BA0836A3CD74EE4AB48753A47211BCC]]></AD_MODULE_ID> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <AD_DEPENDENT_MODULE_ID><![CDATA[EC356CEE3D46416CA1EBEEB9AB82EDB9]]></AD_DEPENDENT_MODULE_ID> -<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.10594]]></STARTVERSION> +<!--E8FD820AFE3D4FE08C02FC47769026AD--> <STARTVERSION><![CDATA[8.1.10598]]></STARTVERSION> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME> <!--E8FD820AFE3D4FE08C02FC47769026AD--> <DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT> diff -r c885d1e00cb2 -r 6f1d4a1ba2db modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js Sun Feb 13 19:14:13 2011 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-grid.js Mon Feb 14 00:37:55 2011 +0100 @@ -241,6 +241,9 @@ if (!this.filterEditor) { return false; } + if (this.filterClause) { + return true; + } for (var prop in criteria) { if (criteria.hasOwnProperty(prop)) { var value = criteria[prop]; diff -r c885d1e00cb2 -r 6f1d4a1ba2db modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view-datasource.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view-datasource.js Sun Feb 13 19:14:13 2011 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view-datasource.js Mon Feb 14 00:37:55 2011 +0100 @@ -23,21 +23,21 @@ // isc.ClassFactory.defineClass('OBViewDataSource', isc.OBRestDataSource); -isc.OBViewDataSource.addProperties( { +isc.OBViewDataSource.addProperties({ - showProgress : function(editedRecord) { - + showProgress: function(editedRecord){ + // don't show it, done to quickly if (!editedRecord._showProgressAfterDelay) { return; } - + if (editedRecord && editedRecord.editColumnLayout) { if (!this.view.isShowingForm) { editedRecord.editColumnLayout.toggleProgressIcon(true); } } - + if (this.view.isShowingForm) { var btn = this.view.toolBar.getLeftMember(isc.OBToolbar.TYPE_SAVE); btn.customState = 'Progress'; @@ -45,22 +45,21 @@ btn.markForRedraw(); } }, - - hideProgress : function(editedRecord) { + + hideProgress: function(editedRecord){ editedRecord._showProgressAfterDelay = false; if (editedRecord && editedRecord.editColumnLayout) { editedRecord.editColumnLayout.toggleProgressIcon(false); } - + // always remove the progress style here anyway var btn = this.view.toolBar.getLeftMember(isc.OBToolbar.TYPE_SAVE); btn.customState = ''; btn.resetBaseStyle(); btn.markForRedraw(); }, - - performDSOperation : function(operationType, data, callback, - requestProperties) { + + performDSOperation: function(operationType, data, callback, requestProperties){ // requestProperties.showPrompt = false; // set the current selected record before the delay var currentRecord = this.view.viewGrid.getSelectedRecord(); @@ -68,44 +67,39 @@ // only show progress after 200ms delay currentRecord._showProgressAfterDelay = true; // keep the edited record in the client context + requestProperties = requestProperties || {}; + requestProperties.clientContext = requestProperties.clientContext || {}; + requestProperties.clientContext.progressIndicatorSelectedRecord = currentRecord; + this.delayCall('showProgress', [requestProperties.clientContext.progressIndicatorSelectedRecord], 200); + } + + // doing row editing + if (this.view.viewGrid.getEditRow() || + this.view.viewGrid.getEditRow() === 0) { if (!requestProperties.clientContext) { requestProperties.clientContext = {}; } - requestProperties.clientContext.progressIndicatorSelectedRecord = currentRecord; - this - .delayCall( - 'showProgress', - [ requestProperties.clientContext.progressIndicatorSelectedRecord ], - 200); + requestProperties.clientContext.editRow = this.view.viewGrid.getEditRow(); } - // doing row editing - if (this.view.viewGrid.getEditRow() || this.view.viewGrid.getEditRow() === 0) { - if (!requestProperties.clientContext) { - requestProperties.clientContext = {}; - } - requestProperties.clientContext.editRow = this.view.viewGrid.getEditRow(); - } - - var newRequestProperties = this.getTabInfoRequestProperties(this.view, - requestProperties); + var newRequestProperties = this.getTabInfoRequestProperties(this.view, requestProperties); // standard update is not sent with operationType var additionalPara = { - _operationType : 'update', - _noActiveFilter : true, - sendOriginalIDBack: true + _operationType: 'update', + _noActiveFilter: true, + sendOriginalIDBack: true }; isc.addProperties(newRequestProperties.params, additionalPara); if (!newRequestProperties.dataSource) { newRequestProperties.dataSource = this; } - this.Super('performDSOperation', [ operationType, data, callback, - newRequestProperties ]); + this.Super('performDSOperation', [operationType, data, callback, newRequestProperties]); }, - - // do special id-handling so that we can replace the old if with the new id + + // do special id-handling so that we can replace the old if with the new + // id // in the correct way, see the ob-view-grid.js editComplete method - validateJSONRecord: function(record) { + validateJSONRecord: function(record){ record = this.Super('validateJSONRecord', arguments); if (record && record._originalId) { var newId = record.id; @@ -115,17 +109,19 @@ return record; }, - transformResponse : function(dsResponse, dsRequest, jsonData) { - - if (dsRequest.clientContext && dsRequest.clientContext.progressIndicatorSelectedRecord) { + transformResponse: function(dsResponse, dsRequest, jsonData){ + + if (dsRequest.clientContext && + dsRequest.clientContext.progressIndicatorSelectedRecord) { this.hideProgress(dsRequest.clientContext.progressIndicatorSelectedRecord); } if (jsonData) { - var errorStatus = !jsonData.response || jsonData.response.status === 'undefined' || jsonData.response.status !== isc.RPCResponse.STATUS_SUCCESS; + var errorStatus = !jsonData.response || + jsonData.response.status === 'undefined' || + jsonData.response.status !== isc.RPCResponse.STATUS_SUCCESS; if (errorStatus) { - var handled = this.view.setErrorMessageFromResponse(dsResponse, - jsonData, dsRequest); - + var handled = this.view.setErrorMessageFromResponse(dsResponse, jsonData, dsRequest); + if (!handled && !dsRequest.willHandleError) { OB.KernelUtilities.handleSystemException(error.message); } @@ -138,7 +134,7 @@ } return this.Super('transformResponse', arguments); }, - + // ** {{{ getTabInfoRequestProperties }}} ** // // Adds tab and module information to the requestProperties. @@ -149,13 +145,13 @@ // Return: // * Original requestProperties including the new module and tab // properties. - getTabInfoRequestProperties : function(theView, requestProperties) { + getTabInfoRequestProperties: function(theView, requestProperties){ if (theView && theView.tabId) { var tabParam = { - params : { - windowId : theView.standardWindow.windowId, - tabId : theView.tabId, - moduleId : theView.moduleId + params: { + windowId: theView.standardWindow.windowId, + tabId: theView.tabId, + moduleId: theView.moduleId } }; if (requestProperties) { diff -r c885d1e00cb2 -r 6f1d4a1ba2db modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js Sun Feb 13 19:14:13 2011 +0100 ------------------------------------------------------------------------------ The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE: Pinpoint memory and threading errors before they happen. Find and fix more than 250 security defects in the development cycle. Locate bottlenecks in serial and parallel code that limit performance. http://p.sf.net/sfu/intel-dev2devfeb _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits