details: /erp/devel/pi/rev/105ffd8a4fe6
changeset: 9411:105ffd8a4fe6
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Mon Dec 27 14:46:43 2010 +0100
summary: [cleanup] Fixed mapping of tabs within modules
diffstat:
src-wad/src/org/openbravo/wad/Wad.java | 7 ++++---
src/org/openbravo/erpCommon/utility/Menu_data.xsql | 3 ++-
src/org/openbravo/erpCommon/utility/Utility.java | 5 +++++
src/org/openbravo/erpCommon/utility/VerticalMenu.java | 3 ++-
4 files changed, 13 insertions(+), 5 deletions(-)
diffs (65 lines):
diff -r 099b47520e74 -r 105ffd8a4fe6 src-wad/src/org/openbravo/wad/Wad.java
--- a/src-wad/src/org/openbravo/wad/Wad.java Mon Dec 27 13:43:16 2010 +0100
+++ b/src-wad/src/org/openbravo/wad/Wad.java Mon Dec 27 14:46:43 2010 +0100
@@ -737,8 +737,9 @@
ArrayList<WadData> servlets = new ArrayList<WadData>();
for (WadData tab : allTabs) {
String tabClassName = "org.openbravo.erpWindows."
- + ("0".equals(tab.windowmodule) ? "" : tab.windowpackage) +
tab.windowname + "."
- + tab.tabname;
+ + ("0".equals(tab.windowmodule) ? "" : tab.windowpackage + ".") +
tab.windowname + "."
+ + tab.tabname + ("0".equals(tab.tabmodule) ? "" : tab.adTabId);
+
WadData servlet = new WadData();
servlet.displayname = tabClassName;
servlet.name = "W" + tab.adTabId;
@@ -760,7 +761,7 @@
ArrayList<WadData> mappings = new ArrayList<WadData>();
for (WadData tab : allTabs) {
String prefix = "/" + ("0".equals(tab.windowmodule) ? "" :
tab.windowpackage)
- + tab.windowname + "/" + tab.tabname;
+ + tab.windowname + "/" + tab.tabname + ("0".equals(tab.tabmodule) ?
"" : tab.adTabId);
WadData mapping = new WadData();
mapping.name = "W" + tab.adTabId;
diff -r 099b47520e74 -r 105ffd8a4fe6
src/org/openbravo/erpCommon/utility/Menu_data.xsql
--- a/src/org/openbravo/erpCommon/utility/Menu_data.xsql Mon Dec 27
13:43:16 2010 +0100
+++ b/src/org/openbravo/erpCommon/utility/Menu_data.xsql Mon Dec 27
14:46:43 2010 +0100
@@ -49,7 +49,8 @@
MW.AD_Module_ID as windowModule, MT.AD_Module_ID as tabModule,
MW.JAVAPACKAGE as windowPackage, MT.JAVAPACKAGE as tabPackage,
AD_MAPPING_FORMAT(to_char(w.name)) as windowName,
- AD_MAPPING_FORMAT(to_char(t.name)) as tabName
+ AD_MAPPING_FORMAT(to_char(t.name)) as tabName,
+ t.ad_tab_id
FROM AD_TREENODE tn,
(SELECT m.AD_Menu_ID, COALESCE(m_t.NAME, m.NAME) AS NAME,
COALESCE(m_t.DESCRIPTION, m.Description) AS DESCRIPTION,
m.IsSummary,m.Action, m.AD_Window_ID, m.AD_Process_ID,
diff -r 099b47520e74 -r 105ffd8a4fe6
src/org/openbravo/erpCommon/utility/Utility.java
--- a/src/org/openbravo/erpCommon/utility/Utility.java Mon Dec 27 13:43:16
2010 +0100
+++ b/src/org/openbravo/erpCommon/utility/Utility.java Mon Dec 27 14:46:43
2010 +0100
@@ -2352,6 +2352,11 @@
url += tab.getWindow().getModule().getJavaPackage();
}
url += mappingFormat(tab.getWindow().getName()) + "/" +
mappingFormat(tab.getName());
+
+ if (!"0".equals(tab.getModule().getId())) {
+ url += tab.getId();
+ }
+
if ("R".equals(type)) {
url += "_Relation.html";
} else if ("X".equals(type)) {
diff -r 099b47520e74 -r 105ffd8a4fe6
src/org/openbravo/erpCommon/utility/VerticalMenu.java
--- a/src/org/openbravo/erpCommon/utility/VerticalMenu.java Mon Dec 27
13:43:16 2010 +0100
+++ b/src/org/openbravo/erpCommon/utility/VerticalMenu.java Mon Dec 27
14:46:43 2010 +0100
@@ -415,7 +415,8 @@
if (menuItem.mappingname.equals("")) {
if (menuItem.action.equals("W")) {
strResultado.append("/" + ("0".equals(menuItem.windowmodule) ? "" :
menuItem.windowpackage)
- + menuItem.windowname + "/" + menuItem.tabname + "_Relation.html");
+ + menuItem.windowname + "/" + menuItem.tabname
+ + ("0".equals(menuItem.tabmodule) ? "" : menuItem.adTabId) +
"_Relation.html");
} else if (menuItem.action.equals("F")) {
strResultado.append("/ad_workflow/WorkflowControl.html?inpadWorkflowId=").append(
menuItem.adWorkflowId);
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
