details: /erp/devel/main/rev/693494e0926e
changeset: 10404:693494e0926e
user: Iván Perdomo <ivan.perdomo <at> openbravo.com>
date: Mon Feb 07 17:09:55 2011 +0100
summary: Added license text to html files
details: /erp/devel/main/rev/7927f04733eb
changeset: 10405:7927f04733eb
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Feb 07 17:34:40 2011 +0100
summary: Select record after save, changed writable --> readonly
details: /erp/devel/main/rev/efe0b9169278
changeset: 10406:efe0b9169278
user: Mikel Irurita <mikel.irurita <at> openbravo.com>
date: Mon Feb 07 18:15:34 2011 +0100
summary: Fixes issue 15831: Complementing the operation calling
printPageClosePopUpAndRefreshParent
Reviewed by alostale
details: /erp/devel/main/rev/21054e203e51
changeset: 10407:21054e203e51
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Mon Feb 07 18:20:52 2011 +0100
summary: CI: merge back from main
details: /erp/devel/main/rev/405bc3b81e4f
changeset: 10408:405bc3b81e4f
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Mon Feb 07 18:23:16 2011 +0100
summary: Reduce time needed to login or change role
- Optimize initialization of EntityAccessChecker by directly fetching
tables associated to ad_window_access instead of the normal lazy-fetching
using many more queries.
- Also optimize away join with ad_table in that code-path by getting
data-access-
level via Entity.getAccessLevel.getDbValue (new utility method)
- Micro-optimization handling getDbValue via int-type instead of String
details: /erp/devel/main/rev/2c3a509d926c
changeset: 10409:2c3a509d926c
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Feb 07 18:43:27 2011 +0100
summary: solved issue with delete multiple records
details: /erp/devel/main/rev/67b1779380be
changeset: 10410:67b1779380be
user: Stefan Hühner <stefan.huehner <at> openbravo.com>
date: Mon Feb 07 18:43:23 2011 +0100
summary: Prepare name change of sample-client QA_Testing -> 'QA Testing'
details: /erp/devel/main/rev/3aac4468bf99
changeset: 10411:3aac4468bf99
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Mon Feb 07 21:23:08 2011 +0100
summary: CI: update AD_MODULE to version 10410
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/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
| 1 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
| 6 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
| 25 --
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
| 23 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
| 64 +++-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 119 +++++----
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.kernel/web/org.openbravo.client.kernel/benchmark/index.html
| 19 +-
modules/org.openbravo.client.kernel/web/org.openbravo.client.kernel/docs/index.html
| 18 +
modules/org.openbravo.client.kernel/web/org.openbravo.client.kernel/ui-test-suite/index.html
| 19 +-
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.service.json/src/org/openbravo/service/json/DefaultJsonDataService.java
| 6 +-
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.selector/web/org.openbravo.userinterface.selector/js/ob-selector-item.js
| 8 +-
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
| 4 +-
src/build.xml
| 2 +-
src/org/openbravo/base/model/AccessLevel.java
| 26 ++-
src/org/openbravo/base/secureApp/PopUp_Close_And_Refresh.html
| 2 +-
src/org/openbravo/dal/security/EntityAccessChecker.java
| 29 +-
49 files changed, 292 insertions(+), 215 deletions(-)
diffs (truncated from 1574 to 300 lines):
diff -r 12a27b9b1e3e -r 3aac4468bf99
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Mon Feb 07 17:00:09 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Mon Feb 07 21:23:08 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.10399]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.10410]]></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 12a27b9b1e3e -r 3aac4468bf99
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
Mon Feb 07 17:00:09 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Mon Feb 07 21:23:08 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.10399]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.10410]]></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.10399]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.10410]]></STARTVERSION>
<!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 12a27b9b1e3e -r 3aac4468bf99
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
Mon Feb 07 17:00:09 2011 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Mon Feb 07 21:23:08 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.10399]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.10410]]></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 12a27b9b1e3e -r 3aac4468bf99
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
Mon Feb 07 17:00:09 2011 +0100
+++
b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Mon Feb 07 21:23:08 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.10399]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.10410]]></STARTVERSION>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 12a27b9b1e3e -r 3aac4468bf99
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
Mon Feb 07 17:00:09 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Mon Feb 07 21:23:08 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.10399]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.10410]]></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 12a27b9b1e3e -r 3aac4468bf99
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
Mon Feb 07 17:00:09 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Mon Feb 07 21:23:08 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.10399]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.10410]]></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.10399]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.10410]]></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.10399]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.10410]]></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.10399]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.10410]]></STARTVERSION>
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 12a27b9b1e3e -r 3aac4468bf99
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
Mon Feb 07 17:00:09 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-field.js.ftl
Mon Feb 07 21:23:08 2011 +0100
@@ -38,6 +38,7 @@
<#if fieldDefinition.redrawOnChange?string = "true" >
redrawOnChange: true,
changed: function(form, item, value) {
+ this.Super('changed', arguments);
form.onFieldChanged(form, item, value);
},
</#if>
diff -r 12a27b9b1e3e -r 3aac4468bf99
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Mon Feb 07 17:00:09 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java
Mon Feb 07 21:23:08 2011 +0100
@@ -267,7 +267,7 @@
final String rowClientId = ((ClientEnabled) row).getClient().getId();
final String currentClientId =
OBContext.getOBContext().getCurrentClient().getId();
if (!rowClientId.equals(currentClientId)) {
- finalObject.put("writable", false);
+ finalObject.put("_readOnly", true);
} else {
boolean writable = false;
final String objectOrgId = ((OrganizationEnabled)
row).getOrganization().getId();
@@ -277,7 +277,9 @@
break;
}
}
- finalObject.put("writable", writable);
+ if (!writable) {
+ finalObject.put("_readOnly", true);
+ }
}
} else {
finalObject.put("writable", true);
diff -r 12a27b9b1e3e -r 3aac4468bf99
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Mon Feb 07 17:00:09 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-formitem-widgets.js
Mon Feb 07 21:23:08 2011 +0100
@@ -151,14 +151,6 @@
return this.getDisplayValue(this.getValue());
},
- changed: function(){
- var ret = this.Super('changed', arguments);
- if (this.form && this.form.handleItemChange) {
- this.form.handleItemChange(this);
- }
- return ret;
- },
-
click: function() {
this.showPicker();
return false;
@@ -399,14 +391,6 @@
// validated on exit
validateOnChange: true,
- changed: function(){
- var ret = this.Super('changed', arguments);
- if (this.form && this.form.handleItemChange) {
- this.form.handleItemChange(this);
- }
- return ret;
- },
-
// prevent db-ids from showing up, works for SelectItem
// not for ComboboxItem
mapValueToDisplay : function(value) {
@@ -463,15 +447,6 @@
return this.getOptionDataSource();
},
- changed: function(){
- var ret = this.Super('changed', arguments);
- if (this.form && this.form.handleItemChange) {
- this.form.handleItemChange(this);
- }
- //this.setValue(this.getDisplayFieldName(), this.getDisplayValue());
- return ret;
- },
-
getOptionDataSource: function(){
if (this.optionDataSource) {
return this.optionDataSource;
diff -r 12a27b9b1e3e -r 3aac4468bf99
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
Mon Feb 07 17:00:09 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
Mon Feb 07 21:23:08 2011 +0100
@@ -262,7 +262,7 @@
return true;
}
var msg = '', title = null, type = isc.OBMessageBar.TYPE_ERROR, isLabel =
false, params = null;
- var gridEditing = req.clientContext.editRow || req.clientContext.editRow
=== 0;
+ var gridEditing = req.clientContext && (req.clientContext.editRow ||
req.clientContext.editRow === 0);
if (isc.isA.String(data)) {
msg = data;
} else if (data && data.response) {
@@ -1143,12 +1143,12 @@
}
},
- deleteRow: function(autoSaveDone){
+ deleteSelectedRows: function(autoSaveDone){
// first save what we have edited
if (!autoSaveDone) {
var actionObject = {
target: this,
- method: this.deleteRow,
+ method: this.deleteSelectedRows,
parameters: [true]
};
this.standardWindow.doActionAfterAutoSave(actionObject, true);
@@ -1163,16 +1163,19 @@
}
var callback = function(ok){
- var i, data, error, removeCallBack = function(resp, data, req){
+ var i, data, deleteData, error, recordInfos = [], removeCallBack =
function(resp, data, req){
if (resp.status === isc.RPCResponse.STATUS_SUCCESS) {
if (view.isShowingForm) {
view.switchFormGridVisibility();
- if (resp.clientContext && resp.clientContext.refreshGrid) {
- view.viewGrid.filterData();
- }
}
view.messageBar.setMessage(isc.OBMessageBar.TYPE_SUCCESS, null,
OB.I18N.getLabel('OBUIAPP_DeleteResult', [deleteCount]));
- view.viewGrid.filterData(view.viewGrid.getCriteria());
+ if (deleteData) {
+ // deleteData is computed below
+ for (var i = 0 ; i < deleteData.ids.length; i++) {
+ recordInfos.push({id: deleteData.ids[i]});
+ }
+ view.viewGrid.data.handleUpdate('remove', recordInfos);
+ }
view.viewGrid.updateRowCountDisplay();
} else {
// get the error message from the dataObject
@@ -1193,7 +1196,7 @@
view.viewGrid.deselectAllRecords();
if (selection.length > 1) {
- var deleteData = {};
+ deleteData = {};
deleteData.entity = view.entity;
deleteData.ids = [];
for (i = 0; i < selection.length; i++) {
@@ -1470,7 +1473,7 @@
getTabMessage: function(){
var callback = function(resp, data, req){
- if (data.type && (data.text || data.title)) {
+ if (req.clientContext && data.type && (data.text || data.title)) {
req.clientContext.messageBar.setMessage(OBMessageBar[data.type],
data.title, data.text);
}
};
diff -r 12a27b9b1e3e -r 3aac4468bf99
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
Mon Feb 07 17:00:09 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-toolbar.js
Mon Feb 07 21:23:08 2011 +0100
@@ -81,7 +81,7 @@
},
DELETE_BUTTON_PROPERTIES: {
action: function(){
- this.view.deleteRow();
+ this.view.deleteSelectedRows();
},
disabled: true,
buttonType: 'eliminate',
diff -r 12a27b9b1e3e -r 3aac4468bf99
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
---
a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
Mon Feb 07 17:00:09 2011 +0100
+++
b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
Mon Feb 07 21:23:08 2011 +0100
@@ -96,7 +96,6 @@
},
doEditRecordActions: function(preventFocus, isNew){
- this.setFocusItem(null);
this.setHasChanged(false);
this.setNewState(isNew);
@@ -288,7 +287,7 @@
if (dynamicCols) {
this.dynamicCols = dynamicCols;
}
- if (!data.writable || this.view.readOnly) {
+ if (data._readOnly || this.view.readOnly) {
this.readOnly = true;
} else {
this.readOnly = false;
@@ -313,10 +312,17 @@
}
delete this.redrawItems;
}
+
+ // store the new values in the edit value
+ if (this.grid) {
------------------------------------------------------------------------------
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
