details: /erp/devel/pi/rev/d6a95289b423
changeset: 9373:d6a95289b423
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Dec 24 07:36:34 2010 +0100
summary: [ModelObject] Remove unneeded checks
details: /erp/devel/pi/rev/51b073719f6e
changeset: 9374:51b073719f6e
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Fri Dec 24 07:51:41 2010 +0100
summary: [ModelObject] When generating web.xml do not take into account
mapping for tabs
evend they exist. In this way modules containing them can be installed.
fixed bug 14236
diffstat:
src-wad/src/org/openbravo/wad/Wad_data.xsql | 19 +++----------------
1 files changed, 3 insertions(+), 16 deletions(-)
diffs (37 lines):
diff -r bf3c3b3462d5 -r 51b073719f6e src-wad/src/org/openbravo/wad/Wad_data.xsql
--- a/src-wad/src/org/openbravo/wad/Wad_data.xsql Fri Dec 24 07:15:41
2010 +0100
+++ b/src-wad/src/org/openbravo/wad/Wad_data.xsql Fri Dec 24 07:51:41
2010 +0100
@@ -29,14 +29,7 @@
MAX(LOADONSTARTUP) AS LOADONSTARTUP, '' AS VALUE, '' AS LINE, '' AS
AUTH, '' as buildxml,
'' as ad_tab_id, '' as windowName, '' as tabName, '' as windowPackage,
'' as windowmodule, '' as tabPackage, '' as tabmodule
FROM AD_MODEL_OBJECT o
- WHERE ((ISACTIVE = 'Y' and ad_tab_id is null)
- or (ad_tab_id is not null
- and exists (select 1
- from ad_window w, ad_tab t
- where t.ad_tab_id = o.ad_tab_id
- and t.ad_window_id = w.ad_window_id
- and t.isactive='Y'
- and w.isactive='Y')))
+ WHERE ISACTIVE = 'Y'
AND OBJECT_TYPE = 'S'
AND ACTION != 'W'
GROUP BY CLASSNAME
@@ -73,15 +66,9 @@
<![CDATA[
SELECT MAX(MO.ACTION || MO.AD_MODEL_OBJECT_ID) AS NAME, MOM.MAPPINGNAME
AS CLASSNAME, MO.CLASSNAME AS DISPLAYNAME
FROM AD_MODEL_OBJECT MO, AD_MODEL_OBJECT_MAPPING MOM
- WHERE ((mo.ISACTIVE = 'Y' and mo.ad_tab_id is null)
- or (mo.ad_tab_id is not null
- and exists (select 1
- from ad_window w, ad_tab t
- where t.ad_tab_id = mo.ad_tab_id
- and t.ad_window_id = w.ad_window_id
- and t.isactive='Y'
- and w.isactive='Y')))
+ WHERE mo.ISACTIVE = 'Y'
AND MO.OBJECT_TYPE = 'S'
+ AND MO.ACTION != 'W'
AND MO.AD_MODEL_OBJECT_ID = MOM.AD_MODEL_OBJECT_ID
GROUP BY MO.CLASSNAME, MOM.MAPPINGNAME
ORDER BY NAME
------------------------------------------------------------------------------
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
