details: /erp/devel/pi/rev/0ad18493377e
changeset: 10662:0ad18493377e
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Tue Feb 15 16:23:03 2011 +0100
summary: CI: update AD_MODULE to version 10653
details: /erp/devel/pi/rev/0b99ddfd0f37
changeset: 10663:0b99ddfd0f37
user: RM packaging bot <staff.rm <at> openbravo.com>
date: Tue Feb 15 16:41:29 2011 +0100
summary: CI: merge back from main
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/ApplicationComponentProvider.java
| 3 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java
| 11 +
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickCreateDataSource.java
| 4 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickLaunchDataSource.java
| 4 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/quick-launch.js.ftl
| 212 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-form.js.ftl
| 43 +-
modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewTab.java
| 2 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-quick-launch.js
| 270 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-standard-view.js
| 3 +
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-form.js
| 17 +-
modules/org.openbravo.client.application/web/org.openbravo.client.application/js/ob-view-grid.js
| 25 +-
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 +-
referencedata/sampledata/F_B_International_Group.xml
| 8927 +++++++++-
referencedata/sampledata/QA_Testing.xml
| 10 +-
src-db/database/sourcedata/AD_MODULE.xml
| 2 +-
46 files changed, 9334 insertions(+), 333 deletions(-)
diffs (truncated from 16141 to 300 lines):
diff -r 225560d67fc4 -r 0b99ddfd0f37
modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
---
a/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Tue Feb 15 13:55:51 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE.xml
Tue Feb 15 16:41:29 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.10644]]></VERSION>
+<!--A918E3331C404B889D69AA9BFAFB23AC-->
<VERSION><![CDATA[3.0.10653]]></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 225560d67fc4 -r 0b99ddfd0f37
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
Tue Feb 15 13:55:51 2011 +0100
+++
b/modules/org.openbravo.advpaymentmngt/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Tue Feb 15 16:41:29 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.10644]]></STARTVERSION>
+<!--89326AE95DAD449D85DFAB2C5B1C6683-->
<STARTVERSION><![CDATA[2.1.10653]]></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.10644]]></STARTVERSION>
+<!--B97FC854C6DD41E692161585645A900F-->
<STARTVERSION><![CDATA[3.0.10653]]></STARTVERSION>
<!--B97FC854C6DD41E692161585645A900F--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDANT_MODULE_NAME><![CDATA[core]]></DEPENDANT_MODULE_NAME>
<!--B97FC854C6DD41E692161585645A900F-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 225560d67fc4 -r 0b99ddfd0f37
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
Tue Feb 15 13:55:51 2011 +0100
+++ b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE.xml
Tue Feb 15 16:41:29 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.10644]]></VERSION>
+<!--C70732EA90A14EC0916078B85CC33D2D-->
<VERSION><![CDATA[1.1.10653]]></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 225560d67fc4 -r 0b99ddfd0f37
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
Tue Feb 15 13:55:51 2011 +0100
+++
b/modules/org.openbravo.base.weld/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Tue Feb 15 16:41:29 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.10644]]></STARTVERSION>
+<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<STARTVERSION><![CDATA[3.0.10653]]></STARTVERSION>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDANT_MODULE_NAME><![CDATA[Core]]></DEPENDANT_MODULE_NAME>
<!--8BDE81545C1A43EAAC4BA3C5ED754DC8-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 225560d67fc4 -r 0b99ddfd0f37
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
Tue Feb 15 13:55:51 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE.xml
Tue Feb 15 16:41:29 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.10644]]></VERSION>
+<!--9BA0836A3CD74EE4AB48753A47211BCC-->
<VERSION><![CDATA[2.1.10653]]></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 225560d67fc4 -r 0b99ddfd0f37
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
Tue Feb 15 13:55:51 2011 +0100
+++
b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MODULE_DEPENDENCY.xml
Tue Feb 15 16:41:29 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.10644]]></STARTVERSION>
+<!--15D7CE8D95D043189162DBABA54A1F61-->
<STARTVERSION><![CDATA[2.1.10653]]></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.10644]]></STARTVERSION>
+<!--60A170212F36499D83B8AD38D01F46B3-->
<STARTVERSION><![CDATA[2.1.10653]]></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.10644]]></STARTVERSION>
+<!--824D60CB352E4099B1D8C903CA139DAE-->
<STARTVERSION><![CDATA[3.0.10653]]></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.10644]]></STARTVERSION>
+<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<STARTVERSION><![CDATA[8.1.10653]]></STARTVERSION>
<!--E8FD820AFE3D4FE08C02FC47769026AD--> <ISINCLUDED><![CDATA[N]]></ISINCLUDED>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDANT_MODULE_NAME><![CDATA[Smartclient]]></DEPENDANT_MODULE_NAME>
<!--E8FD820AFE3D4FE08C02FC47769026AD-->
<DEPENDENCY_ENFORCEMENT><![CDATA[MAJOR]]></DEPENDENCY_ENFORCEMENT>
diff -r 225560d67fc4 -r 0b99ddfd0f37
modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
Tue Feb 15 13:55:51 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/ApplicationComponentProvider.java
Tue Feb 15 16:41:29 2011 +0100
@@ -236,6 +236,9 @@
+ KernelConstants.SKIN_VERSION_PARAMETER
+ "/org.openbravo.client.application/ob-dialog-styles.js", false));
+ globalResources.add(createStaticResource(
+ "web/org.openbravo.client.application/js/ob-quick-launch.js", false));
+
// before the main layout
globalResources.add(createStaticResource(
"web/org.openbravo.userinterface.smartclient/openbravo/skins/"
diff -r 225560d67fc4 -r 0b99ddfd0f37
modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java
Tue Feb 15 13:55:51 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/MenuManager.java
Tue Feb 15 16:41:29 2011 +0100
@@ -89,6 +89,7 @@
// set the globals
final MenuOption localCachedRoot = new MenuOption();
+ localCachedRoot.setDbId("-1"); // just use any value
selectableMenuOptions = new ArrayList<MenuOption>();
for (MenuOption menuOption : menuOptions) {
if (menuOption.getParentMenuOption() == null) {
@@ -404,6 +405,7 @@
if (addOption) {
final MenuOption menuOption = new MenuOption();
menuOption.setTreeNode(treeNode);
+ menuOption.setDbId(treeNode.getId());
if (inactiveSummary) {
menuOption.setVisible(false);
}
@@ -433,6 +435,7 @@
private String label;
private MenuEntryType type = MenuEntryType.Summary;
private String id;
+ private String dbId;
private Menu menu;
private Tab tab;
private Form form;
@@ -643,6 +646,14 @@
public boolean isShowInClassicMode() {
return showInClassicMode;
}
+
+ public String getDbId() {
+ return dbId;
+ }
+
+ public void setDbId(String dbId) {
+ this.dbId = dbId;
+ }
}
private static class MenuComparator implements Comparator<MenuOption> {
diff -r 225560d67fc4 -r 0b99ddfd0f37
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickCreateDataSource.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickCreateDataSource.java
Tue Feb 15 13:55:51 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickCreateDataSource.java
Tue Feb 15 16:41:29 2011 +0100
@@ -109,7 +109,9 @@
data.put("modal", menuOption.isModal());
data.put(JsonConstants.IDENTIFIER, menuOption.getLabel());
- data.put(JsonConstants.ID, menuOption.getId());
+ // use dbid to be sure that it is unique
+ data.put(JsonConstants.ID, menuOption.getDbId());
+ data.put("viewValue", menuOption.getId());
data.put(QuickLaunchDataSource.OPTION_TYPE,
QuickLaunchDataSource.OPTION_TYPE_TAB);
if (menuOption.getMenu() != null && menuOption.getMenu().getWindow()
!= null) {
data.put(QuickLaunchDataSource.WINDOW_ID,
menuOption.getMenu().getWindow().getId());
diff -r 225560d67fc4 -r 0b99ddfd0f37
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickLaunchDataSource.java
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickLaunchDataSource.java
Tue Feb 15 13:55:51 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/QuickLaunchDataSource.java
Tue Feb 15 16:41:29 2011 +0100
@@ -132,7 +132,9 @@
}
data.put("icon", icon);
- data.put(JsonConstants.ID, menuOption.getId());
+ // use dbid to be sure that it is unique
+ data.put(JsonConstants.ID, menuOption.getDbId());
+ data.put("viewValue", menuOption.getId());
data.put("modal", menuOption.isModal());
for (MenuParameter parameter :
menuOption.getMenu().getOBUIAPPMenuParametersList()) {
if (parameter.isActive()) {
diff -r 225560d67fc4 -r 0b99ddfd0f37
modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/quick-launch.js.ftl
---
a/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/quick-launch.js.ftl
Tue Feb 15 13:55:51 2011 +0100
+++
b/modules/org.openbravo.client.application/src/org/openbravo/client/application/navigationbarcomponents/templates/quick-launch.js.ftl
Tue Feb 15 16:41:29 2011 +0100
@@ -18,214 +18,14 @@
*/
/* jslint */
-isc.OBQuickRun.create(OB.QuickLaunchNavbarComponentStylingProperties, {
+isc.OBQuickLaunch.create(OB.QuickLaunchNavbarComponentStylingProperties, {
title: '',
prompt: OB.I18N.getLabel('${data.label}'),
src: '${data.icon}',
-
+ prefixLabel: '${data.prefixRecent}',
+ keyboardShortcutId : '${data.keyboardShortcutId}',
recentPropertyName: '${data.recentPropertyName}',
-
- beforeShow : function() {
- var recent =
OB.RecentUtilities.getRecentValue(this.recentPropertyName);
-
- var RecentFieldType = function(recentObject) {
- var prefixLabel = '${data.prefixRecent}';
- if (prefixLabel.length > 0) {
- this.linkTitle = OB.I18N.getLabel(prefixLabel) + ' ' +
recentObject.tabTitle;
- } else {
- this.linkTitle = recentObject.tabTitle;
- }
- this.value = recentObject.tabTitle;
- this.recentObject = recentObject;
- };
- RecentFieldType.prototype = {
- editorType: 'link',
- value: null,
- showTitle: false,
- target: 'javascript',
- shouldSaveValue: false,
- handleClick: function() {
- OB.RecentUtilities.addRecent('${data.recentPropertyName}',
this.recentObject);
- if (this.recentObject.viewId) {
- OB.Layout.ViewManager.openView(this.recentObject.viewId,
this.recentObject);
- } else {
- OB.Layout.ViewManager.openView('OBClassicWindow',
this.recentObject);
- }
-
- if (isc.OBQuickRun.currentQuickRun) {
- isc.OBQuickRun.currentQuickRun.doHide();
- }
- },
- getValueIcon: function(value) {
- if (this.recentObject.icon) {
- if (this.recentObject.icon === 'Process') {
- return
'[SKINIMG]../../org.openbravo.client.application/images/application-menu/iconProcess.png';
- } else if (this.recentObject.icon === 'Report') {
- return
'[SKINIMG]../../org.openbravo.client.application/images/application-menu/iconReport.png';
- } else if (this.recentObject.icon === 'Form') {
- return
'[SKINIMG]../../org.openbravo.client.application/images/application-menu/iconForm.png';
- } else {
- return
'[SKINIMG]../../org.openbravo.client.application/images/application-menu/iconWindow.png';
- }
- }
- return null;
- }
- };
-
- if (recent && recent.length > 0) {
- var newFields = [];
- var index = 0;
- for (var recentIndex = 0; recentIndex < recent.length;
recentIndex++) {
- if (recent[recentIndex]) {
- newFields[index] = new RecentFieldType(recent[recentIndex]);
- index++;
- }
- }
- this.members[0].setFields(newFields);
- this.layout.showMember(this.members[0]);
- this.members[1].getField('value').setValue(null);
- }
- },
-
- keyboardShortcutId : '${data.keyboardShortcutId}',
-
- initWidget: function() {
- this.Super('initWidget', arguments);
- // register the field in the registry
- var suggestionField = this.members[1].getField('value');
- OB.TestRegistry.register(this.recentPropertyName + '_RECENTFORM',
this.members[0]);
- OB.TestRegistry.register(this.recentPropertyName + '_FORM',
this.members[1]);
- OB.TestRegistry.register(this.recentPropertyName + '_BUTTON', this);
- OB.TestRegistry.register(this.recentPropertyName + '_FIELD',
suggestionField);
- },
-
- members: [ isc.DynamicForm.create({ visibility: 'hidden', numCols: 1}),
- isc.DynamicForm.create({
- autoFocus: true,
- width: '100%',
- titleSuffix: '',
- fields: [{name: 'value',
- cellStyle: OB.DefaultPickListStyleProperties.cellStyle,
- titleStyle: OB.DefaultPickListStyleProperties.titleStyle,
- textBoxStyle: OB.DefaultPickListStyleProperties.textBoxStyle,
- controlStyle: OB.DefaultPickListStyleProperties.controlStyle,
- pickListBaseStyle:
OB.DefaultPickListStyleProperties.pickListBaseStyle,
- pickerIconStyle: OB.DefaultPickListStyleProperties.pickerIconStyle,
- pickerIconSrc: OB.DefaultPickListStyleProperties.pickerIconSrc,
- height: OB.DefaultPickListStyleProperties.height,
- pickerIconWidth: OB.DefaultPickListStyleProperties.pickerIconWidth,
- pickListWidth:
OB.DefaultPickListStyleProperties.quickRunPickListWidth,
- // fixes issue https://issues.openbravo.com/view.php?id=15105
- pickListCellHeight:
OB.DefaultPickListStyleProperties.quickRunPickListCellHeight,
------------------------------------------------------------------------------
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
